Add configurable main and slice view ordering.

Change-Id: I9f5d7399d60971c782fa8ac6fc39a05fa3bbcaa8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 9 insertions, 6 deletions

diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 92a68461..3646ff20 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -454,12 +454,15 @@ void Surface3DRenderer::render(GLuint defaultFboHandle)
     // Handle GL state setup for FBO buffers and clearing of the render surface
     Abstract3DRenderer::render(defaultFboHandle);
 
-    // Draw the surface scene
-    drawScene(defaultFboHandle);
-
-    // In slice mode; draw slice
-    if (m_cachedIsSlicingActivated && m_selectionActive)
-        drawSlicedScene();
+    if (m_cachedScene->isSecondarySubviewOnTop()) {
+        drawScene(defaultFboHandle);
+        if (m_cachedIsSlicingActivated)
+            drawSlicedScene();
+    } else {
+        if (m_cachedIsSlicingActivated)
+            drawSlicedScene();
+        drawScene(defaultFboHandle);
+    }
 
     // Render selection ball
     if (m_selectionPointer && m_selectionActive