diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-22 13:19:49 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2014-04-22 13:24:16 +0300 |
commit | a11dcce773b9ad2a913a32efe0c51b1221694659 (patch) | |
tree | 5cec5b3957af99cf7d4d65540c08827487edd604 /src/datavisualization/engine | |
parent | bf8ed99fb5a474aa6a56d61c9e3a1b5e44d6b6cf (diff) |
Custom Item Example added
Task-number: QTRD-3043
+ surface selection bug fix
- snapshot to be added
Change-Id: I17276e39c304cbf1a58eaa2334eff2268656dbf4
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index bdcb8871..142a9b67 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1163,8 +1163,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) glEnable(GL_TEXTURE_2D); // Draw selection buffer - if (!m_cachedIsSlicingActivated && !m_renderCacheList.isEmpty() - && !m_customRenderCache.isEmpty() + if (!m_cachedIsSlicingActivated && (!m_renderCacheList.isEmpty() + || !m_customRenderCache.isEmpty()) && m_selectionState == SelectOnScene && m_cachedSelectionMode > QAbstract3DGraph::SelectionNone) { m_selectionShader->bind(); @@ -1774,7 +1774,8 @@ void Surface3DRenderer::drawScene(GLuint defaultFboHandle) void Surface3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCamera, const QMatrix4x4 &viewMatrix, - const QMatrix4x4 &projectionMatrix) { + const QMatrix4x4 &projectionMatrix) +{ ShaderHelper *shader = 0; GLfloat alphaForValueSelection = labelValueAlpha / 255.0f; GLfloat alphaForRowSelection = labelRowAlpha / 255.0f; |