summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-07-24 01:16:02 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-07-24 01:16:02 (GMT)
commitc5c716a12c6b8a7aa5cb5c30873cfe134b4c334c (patch)
tree6af1f159eae0450622caa461980f00526fac39f0
parent80fcfd401ff436c10458ccddd1ae4a37401e74fc (diff)
downloadQt-c5c716a12c6b8a7aa5cb5c30873cfe134b4c334c.zip
Qt-c5c716a12c6b8a7aa5cb5c30873cfe134b4c334c.tar.gz
Qt-c5c716a12c6b8a7aa5cb5c30873cfe134b4c334c.tar.bz2
Reset shader stage variables when the custom shader is explicitly removed.
-rw-r--r--src/opengl/gl2paintengineex/qglengineshadermanager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
index 6363212..848a7f1 100644
--- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
+++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
@@ -343,6 +343,8 @@ void QGLEngineShaderManager::removeCustomStage(QGLCustomShaderStage* stage)
delete compiledShader;
compiledShaders[CustomImageSrcFragmentShader] = 0;
+ customSrcStage = 0;
+ customSrcStagePrev = 0;
shaderProgNeedsChanging = true;
}