Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Type-OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Type-OpenVolumeMesh
Commits
3110f889
Commit
3110f889
authored
Apr 25, 2018
by
Martin Schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed a problem with the lastDrawMode not being initialized when picking
renderer is used at startup. fixes
#1
parent
cead023a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT.cc
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT.cc
+9
-0
No files found.
ObjectTypes/VolumeMeshObject/VolumeMeshNodeT.cc
View file @
3110f889
...
@@ -1109,6 +1109,12 @@ void VolumeMeshNodeT<VolumeMeshT>::getRenderObjects(IRenderer* _renderer, GLStat
...
@@ -1109,6 +1109,12 @@ void VolumeMeshNodeT<VolumeMeshT>::getRenderObjects(IRenderer* _renderer, GLStat
template
<
class
VolumeMeshT
>
template
<
class
VolumeMeshT
>
void
VolumeMeshNodeT
<
VolumeMeshT
>::
pick
(
GLState
&
_state
,
PickTarget
_target
)
{
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
// save state
bool
clientStateEnabledVertexArray
=
GLState
::
isClientStateEnabled
(
GL_VERTEX_ARRAY
);
bool
clientStateEnabledVertexArray
=
GLState
::
isClientStateEnabled
(
GL_VERTEX_ARRAY
);
...
@@ -1215,6 +1221,9 @@ void VolumeMeshNodeT<VolumeMeshT>::pick(GLState& _state, PickTarget _target) {
...
@@ -1215,6 +1221,9 @@ void VolumeMeshNodeT<VolumeMeshT>::pick(GLState& _state, PickTarget _target) {
lastPickTarget_
=
_target
;
lastPickTarget_
=
_target
;
if
(
drawModeOverride
)
lastDrawMode_
=
DrawModes
::
NONE
;
// restore state
// restore state
if
(
clientStateEnabledVertexArray
)
if
(
clientStateEnabledVertexArray
)
GLState
::
enableClientState
(
GL_VERTEX_ARRAY
);
GLState
::
enableClientState
(
GL_VERTEX_ARRAY
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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