diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-19 08:20:09 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-09-19 08:21:08 +0300 |
| commit | 96b29fe074347caa825952391ca78cf18fb4f936 (patch) | |
| tree | 5edf0bd95acef65f6487fa20f51f6189a22782f3 /src/datavisualization | |
| parent | 8d84fc94b2cd5a0cc9eb83fd7708920ce785fa1b (diff) | |
Selection ball color from theme (highlightbarcolor)
Task-number: QTRD-2309
Change-Id: I85b97389b59e99cb96d18d6cb19b3b5e4b35aeae
Change-Id: I85b97389b59e99cb96d18d6cb19b3b5e4b35aeae
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); |