aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-08-01 16:19:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-12 17:03:17 +0200
commit5ef37477f99ed97dd6669f05a0ee555fc3baf2ca (patch)
tree888f150fac86ad43060887b793d3d2ad5c4e19f7
parent3ed9f1f4b6f9e17943fe8f756e1ff9d6ba2b6479 (diff)
Don't set opacity when we are not told
Change-Id: I8addc16f37ad9ce431a3b7b2fd1a4884693d7e38 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-rw-r--r--src/quick/scenegraph/util/qsgvertexcolormaterial.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
index 29f95e56b0..eeb30569ec 100644
--- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
+++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp
@@ -66,7 +66,7 @@ QSGMaterialType QSGVertexColorMaterialShader::type;
void QSGVertexColorMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *)
{
- if (!(newEffect->flags() & QSGMaterial::Blending) || state.isOpacityDirty())
+ if (state.isOpacityDirty())
program()->setUniformValue(m_opacity_id, state.opacity());
if (state.isMatrixDirty())