diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-01 13:06:13 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-11-01 13:13:45 +0200 |
commit | 3622990c3d7d1d6b99b2c48303a11a8f8895b2c6 (patch) | |
tree | 8683dd3539c25102f05112b9cacc5e583654fa6f | |
parent | d6087ec8d99f8fbc59626385d35a0aa1b3818026 (diff) |
Fixed minimal qml functionality
Task-number: QTRD-2529
Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r-- | src/datavisualization/engine/drawer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index 418dba77..cf390b9d 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -136,8 +136,10 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui glDisableVertexAttribArray(shader->normalAtt()); glDisableVertexAttribArray(shader->posAtt()); - // Restore the GL state - glActiveTexture(0); + // Release textures + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, 0); + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, 0); } |