#5708: Merge action nodes return an identity transform and the affect…

…ed node's world AABB. This fixes the wrong workzone calculation on selecting such one of the merge wrapper nodes.
codereader · Aug 28, 2021 · 805ecc0 · 805ecc0
1 parent e8baad2
commit 805ecc0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/libs/scene/merge/MergeActionNode.cpp b/libs/scene/merge/MergeActionNode.cpp
@@ -78,7 +78,14 @@ bool MergeActionNodeBase::supportsStateFlag(unsigned int state) const
 
 const AABB& MergeActionNodeBase::localAABB() const
 {
-    return _affectedNode->localAABB();
+    // We report the contained node's world AABB and an identity transform
+    return _affectedNode->worldAABB();
+}
+
+const Matrix4& MergeActionNodeBase::localToWorld() const
+{
+    // We report the contained node's world AABB and an identity transform
+    return Matrix4::getIdentity();
 }
 
 void MergeActionNodeBase::renderSolid(RenderableCollector& collector, const VolumeTest& volume) const

diff --git a/libs/scene/merge/MergeActionNode.h b/libs/scene/merge/MergeActionNode.h
@@ -48,6 +48,7 @@ class MergeActionNodeBase :
     bool supportsStateFlag(unsigned int state) const override;
 
     const AABB& localAABB() const override;
+    const Matrix4& localToWorld() const override;
 
     void renderSolid(RenderableCollector& collector, const VolumeTest& volume) const override;
     void renderWireframe(RenderableCollector& collector, const VolumeTest& volume) const override;