summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/selectionpointer_p.h
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-04-24 07:37:58 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-04-24 09:22:01 +0300
commit2b19a3ae8b8c34ea674058c7b82de44397e29df2 (patch)
treec910d61096b99cf2271b61ac3050644b302cf299 /src/datavisualization/engine/selectionpointer_p.h
parent555acef736a72cdc92113a268826a6bba77fbe40 (diff)
Color problem fixed
Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer_p.h')
-rw-r--r--src/datavisualization/engine/selectionpointer_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index 1eac22be..7c6762be 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -57,7 +57,7 @@ public:
void updateBoundingRect(const QRect &rect);
void updateScene(Q3DScene *scene);
void updateSliceData(bool sliceActivated, GLfloat autoScaleAdjustment);
- void setHighlightColor(const QVector3D &colorVector);
+ void setHighlightColor(const QVector4D &colorVector);
void setRotation(const QQuaternion &rotation);
private:
@@ -81,7 +81,7 @@ private:
QString m_label;
bool m_cachedIsSlicingActivated;
GLfloat m_autoScaleAdjustment;
- QVector3D m_highlightColor;
+ QVector4D m_highlightColor;
QQuaternion m_rotation;
};