From 69b0c64460dba18589ba7ef813c5871b390cf023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 1 Nov 2013 13:06:13 +0200 Subject: Fixed minimal qml functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2529 Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Change-Id: I84d9a86ce128b4c02324abf0458d68a19deda9ce Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/drawer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/datavisualization') diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index 39fd57cb..8643d6d9 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); } -- cgit v1.2.3