Merge branch '5.15' into dev

Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7

1 files changed, 7 insertions, 6 deletions

diff --git a/src/render/jobs/updateworldtransformjob.cpp b/src/render/jobs/updateworldtransformjob.cpp
index 13e14442f..e3c8077f4 100644
--- a/src/render/jobs/updateworldtransformjob.cpp
+++ b/src/render/jobs/updateworldtransformjob.cpp
@@ -65,11 +65,13 @@ struct TransformUpdate
     QMatrix4x4 worldTransformMatrix;
 };
 
-QVector<TransformUpdate> updateWorldTransformAndBounds(NodeManagers *manager, Entity *node, const Matrix4x4 &parentTransform)
+void updateWorldTransformAndBounds(NodeManagers *manager, Entity *node, const Matrix4x4 &parentTransform, QVector<TransformUpdate> &updatedTransforms)
 {
+    if (!node->isEnabled())
+        return;
+
     Matrix4x4 worldTransform(parentTransform);
     Transform *nodeTransform = node->renderComponent<Transform>();
-    QVector<TransformUpdate> updatedTransforms;
 
     const bool hasTransformComponent = nodeTransform != nullptr && nodeTransform->isEnabled();
     if (hasTransformComponent)
@@ -85,9 +87,8 @@ QVector<TransformUpdate> updateWorldTransformAndBounds(NodeManagers *manager, En
     for (const HEntity &handle : childrenHandles) {
         Entity *child = manager->renderNodesManager()->data(handle);
         if (child)
-            updatedTransforms += updateWorldTransformAndBounds(manager, child, worldTransform);
+            updateWorldTransformAndBounds(manager, child, worldTransform, updatedTransforms);
     }
-    return updatedTransforms;
 }
 
 }
@@ -108,7 +109,7 @@ UpdateWorldTransformJob::UpdateWorldTransformJob()
     , m_node(nullptr)
     , m_manager(nullptr)
 {
-    SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTransform, 0);
+    SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTransform, 0)
 }
 
 void UpdateWorldTransformJob::setRoot(Entity *root)
@@ -137,7 +138,7 @@ void UpdateWorldTransformJob::run()
     Entity *parent = m_node->parent();
     if (parent != nullptr)
         parentTransform = *(parent->worldTransform());
-    d->m_updatedTransforms = updateWorldTransformAndBounds(m_manager, m_node, parentTransform);
+    updateWorldTransformAndBounds(m_manager, m_node, parentTransform, d->m_updatedTransforms);
 
     qCDebug(Jobs) << "Exiting" << Q_FUNC_INFO << QThread::currentThread();
 }