summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@jollamobile.com>2015-01-22 09:36:07 +0100
committerGunnar Sletta <gunnar@sletta.org>2015-03-10 18:14:03 +0000
commit36d7b8240c9cb0096fc603981dd41abd9f1e7915 (patch)
treef97985b09fad15f4663140c10ebc91ab8f907704
parent95d6fbc30b180018a6f6d9a69d31b03223608e22 (diff)
downloadqtgraphicaleffects-36d7b8240c9cb0096fc603981dd41abd9f1e7915.tar.gz
Exclude images from the textureProvider branch.
We already checked them just above, and since they are texture providers, they would falsely report true here leading to bugs.. Change-Id: I70e29f15333a00ca973c16f9f3396d216bc014df Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
-rw-r--r--src/effects/private/qgfxsourceproxy.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/effects/private/qgfxsourceproxy.cpp b/src/effects/private/qgfxsourceproxy.cpp
index 5ee9280..a319e18 100644
--- a/src/effects/private/qgfxsourceproxy.cpp
+++ b/src/effects/private/qgfxsourceproxy.cpp
@@ -133,7 +133,7 @@ void QGfxSourceProxy::updatePolish()
// item is an image with default tiling, use directly
setOutput(m_input);
- } else if (m_input->isTextureProvider() && m_input->childItems().size() == 0) {
+ } else if (!image && m_input->isTextureProvider() && m_input->childItems().size() == 0) {
// item is a texture provider without children, use directly...
setOutput(m_input);