diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:16 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-02 13:14:35 +0300 |
| commit | 50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch) | |
| tree | ba5b78cc2187709f33ccc6da9d7581c7f63729f6 /src/datavisualization/engine/surface3drenderer.cpp | |
| parent | 0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff) | |
Refactored MeshStyle and InputState
Task-number: QTRD-2362
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index b0472c9b..4501c126 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -919,7 +919,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) glEnable(GL_TEXTURE_2D); // Draw selection buffer - if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputOnScene + if (!m_cachedIsSlicingActivated && m_controller->inputState() == QDataVis::InputStateOnScene && m_surfaceObj && m_cachedSelectionMode > QDataVis::SelectionModeNone) { m_selectionShader->bind(); glBindFramebuffer(GL_FRAMEBUFFER, m_selectionFrameBuffer); @@ -1649,7 +1649,7 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) m_selectionModeChanged = false; } - if (m_controller->inputState() == QDataVis::InputOnOverview) { + if (m_controller->inputState() == QDataVis::InputStateOnOverview) { if (m_cachedIsSlicingActivated) { m_cachedScene->setSlicingActive(false); m_selectionActive = false; |