From 96b29fe074347caa825952391ca78cf18fb4f936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 19 Sep 2013 08:20:09 +0300 Subject: Selection ball color from theme (highlightbarcolor) Task-number: QTRD-2309 Change-Id: I85b97389b59e99cb96d18d6cb19b3b5e4b35aeae Change-Id: I85b97389b59e99cb96d18d6cb19b3b5e4b35aeae Reviewed-by: Miikka Heikkinen --- src/datavisualization/engine/selectionpointer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/datavisualization') diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index 0dfe3bb2..98a75f86 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -134,7 +134,8 @@ void SelectionPointer::render(GLuint defaultFboHandle) m_pointShader->setUniformValue(m_pointShader->view(), viewMatrix); m_pointShader->setUniformValue(m_pointShader->model(), modelMatrix); m_pointShader->setUniformValue(m_pointShader->nModel(), itModelMatrix.inverted().transposed()); - m_pointShader->setUniformValue(m_pointShader->color(), QVector3D(1.0f, 0.0f, 0.0f)); + m_pointShader->setUniformValue(m_pointShader->color(), + Utils::vectorFromColor(m_cachedTheme.m_highlightBarColor)); m_pointShader->setUniformValue(m_pointShader->MVP(), MVPMatrix); m_pointShader->setUniformValue(m_pointShader->ambientS(), m_cachedTheme.m_ambientStrength); m_pointShader->setUniformValue(m_pointShader->lightS(), m_cachedTheme.m_lightStrength * 2.0f); -- cgit v1.2.3