diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:46:49 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:48:41 +0200 |
| commit | bc317e1ea56c85a41413a5ddde4112623a1b4913 (patch) | |
| tree | e51b2b78f81940cfc70b49953308197080cd368f /src/datavisualizationqml2/glstatestore_p.h | |
| parent | 03cbebd97354b7251e87dcde8adc6b49eba973e5 (diff) | |
| parent | 46ef32d424d7e0209e52528286e31f656c654289 (diff) | |
Merge branch 'develop'
Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
Diffstat (limited to 'src/datavisualizationqml2/glstatestore_p.h')
| -rw-r--r-- | src/datavisualizationqml2/glstatestore_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h index 4add606b..48b30a15 100644 --- a/src/datavisualizationqml2/glstatestore_p.h +++ b/src/datavisualizationqml2/glstatestore_p.h @@ -71,7 +71,7 @@ public: QScopedArrayPointer<GLint> m_vertexAttribArrayTypes; QScopedArrayPointer<GLint> m_vertexAttribArrayNormalized; QScopedArrayPointer<GLint> m_vertexAttribArrayStrides; - QScopedArrayPointer<GLint> m_vertexAttribArrayOffsets; + QScopedArrayPointer<void *> m_vertexAttribArrayOffsets; GLint m_activeTexture; GLint m_texBinding2D; |