summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-04-24 09:40:24 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-04-25 06:09:09 +0300
commitbff870b1a377a896ca1dca9d2fe8b9cdd245c4a6 (patch)
treee43243c26740239107c82dfc9abed41049339706
parent2b19a3ae8b8c34ea674058c7b82de44397e29df2 (diff)
Scatter label selection fixed
Task-number: QTRD-3053 Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1 Change-Id: Ia0f1a9061d29b799bc60d8c965de4c012fa852b1 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
-rw-r--r--src/datavisualization/engine/scatter3drenderer.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index adda3b9f..3bd06517 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -1387,7 +1387,7 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
m_drawer->drawLabel(m_dummyRenderItem, axisLabelItem, viewMatrix, projectionMatrix,
zeroVector, labelRotateVector, 0, m_cachedSelectionMode,
- m_labelShader, m_labelObj, activeCamera, true, true,
+ shader, m_labelObj, activeCamera, true, true,
Drawer::LabelMid, alignment);
}
labelNbr++;
@@ -1441,7 +1441,7 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
m_drawer->drawLabel(m_dummyRenderItem, axisLabelItem, viewMatrix, projectionMatrix,
zeroVector, labelRotateVector, 0, m_cachedSelectionMode,
- m_labelShader, m_labelObj, activeCamera, true, true,
+ shader, m_labelObj, activeCamera, true, true,
Drawer::LabelMid, alignment);
}
labelNbr++;
@@ -1516,7 +1516,7 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
m_dummyRenderItem.setTranslation(labelTransBack);
m_drawer->drawLabel(m_dummyRenderItem, axisLabelItem, viewMatrix, projectionMatrix,
zeroVector, labelRotateVectorBack, 0, m_cachedSelectionMode,
- m_labelShader, m_labelObj, activeCamera, true, true,
+ shader, m_labelObj, activeCamera, true, true,
Drawer::LabelMid, alignmentBack);
// Side wall
@@ -1524,7 +1524,7 @@ void Scatter3DRenderer::drawLabels(bool drawSelection, const Q3DCamera *activeCa
m_dummyRenderItem.setTranslation(labelTransSide);
m_drawer->drawLabel(m_dummyRenderItem, axisLabelItem, viewMatrix, projectionMatrix,
zeroVector, labelRotateVectorSide, 0, m_cachedSelectionMode,
- m_labelShader, m_labelObj, activeCamera, true, true,
+ shader, m_labelObj, activeCamera, true, true,
Drawer::LabelMid, alignmentSide);
}
labelNbr++;