Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
Type-OpenVolumeMesh
Commits
3110f889
Commit
3110f889
authored
Apr 25, 2018
by
Martin Schultz
Browse files
fixed a problem with the lastDrawMode not being initialized when picking
renderer is used at startup. fixes
#1
parent
cead023a
Changes
1
Hide whitespace changes
Inline
Side-by-side
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT.cc
View file @
3110f889
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment