diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 12:05:07 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-14 12:08:41 +0300 |
| commit | f5660bb47845387bbd0a21a4169ae48f7177112b (patch) | |
| tree | daca8d0c75f489571f33735e1e8fa565c8c47ad0 /src/datavisualization/engine/drawer.cpp | |
| parent | 2240de43294ec080d8aa665c7a0731ea81ea6c1f (diff) | |
Mac slice issue fix
Task-number: QTRD-2390
Change-Id: Ia691fdbe9f4b3144bbd59e2ce388a7270a7669fd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/drawer.cpp')
| -rw-r--r-- | src/datavisualization/engine/drawer.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index b3b0fe99..e2ed6748 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -117,12 +117,10 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui glBindBuffer(GL_ARRAY_BUFFER, object->normalBuf()); glVertexAttribPointer(shader->normalAtt(), 3, GL_FLOAT, GL_FALSE, 0, (void*)0); - if (textureId || depthTextureId) { - // 3rd attribute buffer : UVs - glEnableVertexAttribArray(shader->uvAtt()); - glBindBuffer(GL_ARRAY_BUFFER, object->uvBuf()); - glVertexAttribPointer(shader->uvAtt(), 2, GL_FLOAT, GL_FALSE, 0, (void*)0); - } + // 3rd attribute buffer : UVs + glEnableVertexAttribArray(shader->uvAtt()); + glBindBuffer(GL_ARRAY_BUFFER, object->uvBuf()); + glVertexAttribPointer(shader->uvAtt(), 2, GL_FLOAT, GL_FALSE, 0, (void*)0); // Index buffer glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, object->elementBuf()); @@ -134,9 +132,7 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); - if (textureId || depthTextureId) - glDisableVertexAttribArray(shader->uvAtt()); - + glDisableVertexAttribArray(shader->uvAtt()); glDisableVertexAttribArray(shader->normalAtt()); glDisableVertexAttribArray(shader->posAtt()); |