Skip to content
Snippets Groups Projects
Commit 3110f889 authored by Martin Schultz's avatar Martin Schultz
Browse files

fixed a problem with the lastDrawMode not being initialized when picking

renderer is used at startup. fixes #1
parent cead023a
No related branches found
No related tags found
1 merge request!11fixed a problem with the lastDrawMode not being initialized when picking
......@@ -1109,6 +1109,12 @@ void VolumeMeshNodeT<VolumeMeshT>::getRenderObjects(IRenderer* _renderer, GLStat
template<class VolumeMeshT>
void VolumeMeshNodeT<VolumeMeshT>::pick(GLState& _state, PickTarget _target) {
bool drawModeOverride = false;
if(lastDrawMode_ == DrawModes::NONE) // no last drawmode so the picking renderer
{ // is probably calling this function for rendering
lastDrawMode_ = drawMode();
drawModeOverride = true;
}
// save state
bool clientStateEnabledVertexArray = GLState::isClientStateEnabled(GL_VERTEX_ARRAY);
......@@ -1215,6 +1221,9 @@ void VolumeMeshNodeT<VolumeMeshT>::pick(GLState& _state, PickTarget _target) {
lastPickTarget_ = _target;
if(drawModeOverride)
lastDrawMode_ = DrawModes::NONE;
// restore state
if (clientStateEnabledVertexArray)
GLState::enableClientState(GL_VERTEX_ARRAY);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment