summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-01-13 04:02:40 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-01-13 04:02:40 (GMT)
commit08c3b4b7c3c384829f7f86ec2d8e7f3499942284 (patch)
tree8b1e09e7ad734e60dce70959f245c99408550a96 /src/opengl/gl2paintengineex
parent5acc7d86245c17c690b09a742acfe80e6076f599 (diff)
parent6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff)
downloadQt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.zip
Qt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.tar.gz
Qt-08c3b4b7c3c384829f7f86ec2d8e7f3499942284.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
Diffstat (limited to 'src/opengl/gl2paintengineex')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 5901601..ff096c2 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -559,6 +559,9 @@ void QGL2PaintEngineExPrivate::resetGLState()
glDepthMask(true);
glDepthFunc(GL_LESS);
glClearDepth(1);
+ glStencilMask(0xff);
+ glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+ glStencilFunc(GL_ALWAYS, 0, 0xff);
}
void QGL2PaintEngineEx::endNativePainting()