diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:21:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:22:45 +0200 |
| commit | 79bcab5c2a2be73d20364e7ccd718856659510cc (patch) | |
| tree | d54bde658b37021d254167cc1de96d43c810f9f6 /src/datavisualization/utils/objecthelper_p.h | |
| parent | 4a8a1e06f12a8b9d16696a4c559c325f771cad0c (diff) | |
| parent | 11ed44c13c227c73d9b2ec416aed54b00bda2a0a (diff) | |
Merge branch 'develop'
Change-Id: I6f95e28fa94127ddf2380794323fa5ef0ddfe2c4
Diffstat (limited to 'src/datavisualization/utils/objecthelper_p.h')
| -rw-r--r-- | src/datavisualization/utils/objecthelper_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/utils/objecthelper_p.h b/src/datavisualization/utils/objecthelper_p.h index 92de3838..7e13e2a3 100644 --- a/src/datavisualization/utils/objecthelper_p.h +++ b/src/datavisualization/utils/objecthelper_p.h @@ -48,7 +48,7 @@ public: static void releaseObjectHelper(const Abstract3DRenderer *cacheId, ObjectHelper *&obj); inline const QString &objectFile() { return m_objectFile; } - inline const QVector<unsigned short> &indices() const { return m_indices; } + inline const QVector<GLuint> &indices() const { return m_indices; } inline const QVector<QVector3D> &indexedvertices() const { return m_indexedVertices; } inline const QVector<QVector2D> &indexedUVs() const { return m_indexedUVs; } inline const QVector<QVector3D> &indexedNormals() const { return m_indexedNormals; } @@ -59,7 +59,7 @@ private: void load(); QString m_objectFile; - QVector<unsigned short> m_indices; + QVector<GLuint> m_indices; QVector<QVector3D> m_indexedVertices; QVector<QVector2D> m_indexedUVs; QVector<QVector3D> m_indexedNormals; |