summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/bars3drenderer.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-05-14 07:33:23 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-05-14 08:30:24 +0300
commitc5e993ad507cc0d56d0e2a62076584d020086ad7 (patch)
tree7c13a0fa99d43d6c6fcb196beb4c664d5db98334 /src/datavisualization/engine/bars3drenderer.cpp
parenta309eb6a29fcdd57f37aef424c30bc13f3fde9b7 (diff)
Use blending for custom items only when needed
Task-number: QTRD-3077 Change-Id: I2406a8fd133943379a5cb1c1c2961a419ef9315f Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/bars3drenderer.cpp')
-rw-r--r--src/datavisualization/engine/bars3drenderer.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp
index 015f76d5..661c3f3e 100644
--- a/src/datavisualization/engine/bars3drenderer.cpp
+++ b/src/datavisualization/engine/bars3drenderer.cpp
@@ -1474,10 +1474,6 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
// Reset culling
glCullFace(GL_BACK);
- Abstract3DRenderer::drawCustomItems(RenderingNormal, m_customItemShader, viewMatrix,
- projectionViewMatrix, depthProjectionViewMatrix,
- m_depthTexture, m_shadowQualityToShader);
-
// Bind background shader
m_backgroundShader->bind();
@@ -1800,6 +1796,11 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle)
}
}
}
+
+ Abstract3DRenderer::drawCustomItems(RenderingNormal, m_customItemShader, viewMatrix,
+ projectionViewMatrix, depthProjectionViewMatrix,
+ m_depthTexture, m_shadowQualityToShader);
+
drawLabels(false, activeCamera, viewMatrix, projectionMatrix, rowScaleFactor,
columnScaleFactor);