Merge remote-tracking branch 'origin/master' into 1.11

# Conflicts: # Content/Editor/DebugMaterials/DDGIDebugProbes.flax # Source/Editor/Windows/OutputLogWindow.cs # Source/Engine/Level/Actor.cpp
2025-09-24 18:18:27 +02:00
parent f323fdb592 47670251ef
commit 87e2c4c4d5
136 changed files with 1821 additions and 662 deletions
--- a/Source/Engine/Physics/Colliders/Collider.cpp
+++ b/Source/Engine/Physics/Colliders/Collider.cpp
@@ -246,7 +246,7 @@ void Collider::UpdateGeometry()
            const auto rigidBody = dynamic_cast<RigidBody*>(GetParent());
            if (_staticActor != nullptr || (rigidBody && CanAttach(rigidBody)))
            {
-                PhysicsBackend::AttachShape(_shape, actor);
+                Attach(rigidBody);
            }
            else
            {