diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-02-12 15:49:38 (GMT) |
| commit | c04fd421375562f2db8ab89d7bb9509d9b655dd2 (patch) | |
| tree | 411853760626883241748157b8e3dca1b272722f /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | |
| parent | 441aff9d01a1530d2b187098c7c47bc683116a66 (diff) | |
| parent | 3fb70a8beea1dda58e50831edc5dd9073b899f72 (diff) | |
| download | Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.zip Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.gz Qt-c04fd421375562f2db8ab89d7bb9509d9b655dd2.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp index 24560d1..b17e3a1 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp @@ -559,6 +559,12 @@ void QGL2PaintEngineExPrivate::resetGLState() glStencilMask(0xff); glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP); glStencilFunc(GL_ALWAYS, 0, 0xff); + glDisableVertexAttribArray(QT_TEXTURE_COORDS_ATTR); + glDisableVertexAttribArray(QT_VERTEX_COORDS_ATTR); + glDisableVertexAttribArray(QT_OPACITY_ATTR); +#ifndef QT_OPENGL_ES_2 + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); // color may have been changed by glVertexAttrib() +#endif } void QGL2PaintEngineEx::endNativePainting() |