fix GL1.2 saturation modulation for non opaques

whether a window is ARGB or just not opaque does
not matter

BUG: 319091
FIXED-IN: 4.11
REVIEW: 111433
This commit is contained in:
Thomas Lübking 2013-07-07 21:14:06 +02:00
parent bcf6c9c319
commit 9f69a793e8

View file

@ -1730,7 +1730,7 @@ void SceneOpenGL1Window::prepareStates(TextureType type, qreal opacity, qreal br
glColor4f(opacity, opacity, opacity, opacity); glColor4f(opacity, opacity, opacity, opacity);
tex->bind(); tex->bind();
if (alpha || brightness != 1.0f) { if (alpha || !opaque || brightness != 1.0f) {
glActiveTexture(GL_TEXTURE3); glActiveTexture(GL_TEXTURE3);
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE); glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);