summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire.ecortex@kdab.com>2014-10-31 08:27:02 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-10-31 10:43:09 +0100
commitfa01c7e5b4b3eba34a9f927d51d5c4f576f1d5dd (patch)
treeaff630054024bc374f806c3a881e0124adb92046
parente35cef4bbea4a091a22630ba5d100ced657e2b25 (diff)
Fix RenderTransform::sceneChangeEvent
Patch 54d0ef3ba (Micro-optimize RenderTransform::sceneChangeEvent) removed the check against the property name in RenderTransform and considered that the NodeUpdate notification would always be for the"matrix" property. This is unfortunately not the case and breaks the shadow-map-example. We receive notifications for all user defined properties that are defined within a QML Transform element. This patch restores the property name check. Change-Id: I50ec3aab2e982d5a6055c73c3153211f4042669f Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/render/backend/rendertransform.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp
index 74e797184..f08a86198 100644
--- a/src/render/backend/rendertransform.cpp
+++ b/src/render/backend/rendertransform.cpp
@@ -83,7 +83,8 @@ void RenderTransform::sceneChangeEvent(const QSceneChangePtr &e)
{
if (e->type() == NodeUpdated) {
const QScenePropertyChangePtr &propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
- m_transformMatrix = propertyChange->value().value<QMatrix4x4>();
+ if (propertyChange->propertyName() == QByteArrayLiteral("matrix"))
+ m_transformMatrix = propertyChange->value().value<QMatrix4x4>();
}
}