Merge branch 'develop'

Change-Id: If4f8d444cb9e94fff8a8e2a457712b7a9aedd6f4

1 files changed, 4 insertions, 5 deletions

diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 78d80e47..a7f9e2b3 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -324,6 +324,10 @@ void Bars3DRenderer::drawSlicedScene()
 
     GLfloat barPosYAdjustment = -0.8f; // Translate to -1.0 + 0.2 for row/column labels
     GLfloat scaleFactor = 0.0f;
+    if (rowMode)
+        scaleFactor = (1.1f * m_rowWidth) / m_scaleFactor;
+    else
+        scaleFactor = (1.1f * m_columnDepth) / m_scaleFactor;
     GLfloat barLabelYPos = barPosYAdjustment - 0.4f - labelMargin; // 0.4 for labels
     GLfloat zeroPosAdjustment = 0.0f;
     if (!m_noZeroInRange)
@@ -348,11 +352,6 @@ void Bars3DRenderer::drawSlicedScene()
         lineShader->setUniformValue(lineShader->lightS(), 0.0f);
         lineShader->setUniformValue(lineShader->lightColor(), lightColor);
 
-        if (rowMode)
-            scaleFactor = (1.1f * m_rowWidth) / m_scaleFactor;
-        else
-            scaleFactor = (1.1f * m_columnDepth) / m_scaleFactor;
-
         GLfloat gridStep = (2.0f * m_axisCacheY.subSegmentStep()) / m_heightNormalizer;
         GLfloat gridPos = barPosYAdjustment;
         int lastSegment = m_axisCacheY.subSegmentCount() * m_axisCacheY.segmentCount();