summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/surface3drenderer.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-09-16 10:27:06 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-09-16 10:30:11 +0300
commit7805902c5b056f94a8f8302eebf7da180bffe0b4 (patch)
tree96fcd25984a91533d4213113210b967b294565a8 /src/datavisualization/engine/surface3drenderer.cpp
parentce6aff50ecd1445d148c1bbb9f712d6bfb77a78e (diff)
Fix to slice crash bug fix
Task-number: QTRD-3301 Change-Id: Ia0ae6d5e3ac9aabc9af9199df27bbbe7f7908d60 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer.cpp')
-rw-r--r--src/datavisualization/engine/surface3drenderer.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 19ae0de4..9bee6b30 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -782,8 +782,11 @@ void Surface3DRenderer::render(GLuint defaultFboHandle)
void Surface3DRenderer::drawSlicedScene()
{
- if (!m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionSlice)) {
- qWarning("Selection mode QAbstract3DGraph::SelectionSlice not set. It must be set before calling setSlicingActive(true).");
+ if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow)
+ == m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn)) {
+ qWarning("Invalid selection mode. Either QAbstract3DGraph::SelectionRow or"
+ " QAbstract3DGraph::SelectionColumn must be set before calling"
+ " setSlicingActive(true).");
return;
}