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

# Conflicts: # Source/Engine/Level/Actors/Sky.cpp
2025-10-03 22:37:32 +02:00
parent 93219793d5 8f3b80492e
commit 823ed247d2
26 changed files with 152 additions and 258 deletions
--- a/Source/Engine/Terrain/Terrain.cpp
+++ b/Source/Engine/Terrain/Terrain.cpp
@@ -859,9 +859,7 @@ void Terrain::OnEnable()
    {
        auto patch = _patches[i];
        if (patch->_physicsActor)
-        {
            PhysicsBackend::AddSceneActor(scene, patch->_physicsActor);
-        }
    }

    // Base
@@ -880,9 +878,7 @@ void Terrain::OnDisable()
    {
        auto patch = _patches[i];
        if (patch->_physicsActor)
-        {
            PhysicsBackend::RemoveSceneActor(scene, patch->_physicsActor);
-        }
    }

    // Base