diff options
author | Trond Kjernåsen <trond@trolltech.com> | 2009-08-28 11:26:40 (GMT) |
---|---|---|
committer | Trond Kjernåsen <trond@trolltech.com> | 2009-08-28 13:47:02 (GMT) |
commit | df66f388bb135d7f22632d7d98ffa0e4d8a417f3 (patch) | |
tree | ccded7306ff08a844866dde1b3c860b77d23961e /src/opengl | |
parent | 8d0b487437e731ff3f5f97779002a4ffb48d92ec (diff) | |
download | Qt-df66f388bb135d7f22632d7d98ffa0e4d8a417f3.zip Qt-df66f388bb135d7f22632d7d98ffa0e4d8a417f3.tar.gz Qt-df66f388bb135d7f22632d7d98ffa0e4d8a417f3.tar.bz2 |
Fixed a problem where the InvertedYBindOption was always removed.
Reviewed-by: Samuel
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index aca60bc..733994e 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1694,7 +1694,7 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmapData *pmd, con glBindTexture(GL_TEXTURE_2D, textureId); - if (!((hasAlpha && RGBAConfigInverted) || (!hasAlpha && RGBConfigInverted))); + if (!((hasAlpha && RGBAConfigInverted) || (!hasAlpha && RGBConfigInverted))) options &= ~QGLContext::InvertedYBindOption; QGLTexture *texture = new QGLTexture(q, textureId, GL_TEXTURE_2D, options); if (texture->options & QGLContext::InvertedYBindOption) |