diff options
| author | Simon Hausmann <[email protected]> | 2016-01-22 15:20:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2016-01-22 15:21:06 +0100 |
| commit | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (patch) | |
| tree | 16e17d4c52d35f7e55fc2103db5c96850e9bdfff /src/quick/scenegraph | |
| parent | ce093497f2d4164fa8abc06cf976f9e36798e11e (diff) | |
| parent | b60a5dc9405ce89d7a742abc81b906d5c8cf5f7d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultimagenode.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp index f1d41fcc69..c26092e20c 100644 --- a/src/quick/scenegraph/qsgdefaultimagenode.cpp +++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp @@ -293,7 +293,8 @@ void QSGDefaultImageNode::preprocess() QSGDynamicTexture *t = qobject_cast<QSGDynamicTexture *>(m_material.texture()); if (t) { doDirty = t->updateTexture(); - updateGeometry(); + if (doDirty) + updateGeometry(); } bool alpha = m_material.flags() & QSGMaterial::Blending; if (m_material.texture() && alpha != m_material.texture()->hasAlphaChannel()) { |