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

# Conflicts: # Flax.flaxproj
2023-10-09 12:40:47 +02:00
parent 18aafb6fc7 8e23781153
commit 09f2be907e
86 changed files with 1406 additions and 686 deletions
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -886,6 +886,14 @@ void Actor::EndPlay()
        OnDisable();
    }

+    for (auto* script : Scripts)
+    {
+        CHECK_EXECUTE_IN_EDITOR
+        {
+            script->OnDestroy();
+        }
+    }
+
    OnEndPlay();

    // Clear flag
@@ -899,15 +907,6 @@ void Actor::EndPlay()
            e->EndPlay();
    }

-    // Fire event for scripting
-    for (auto* script : Scripts)
-    {
-        CHECK_EXECUTE_IN_EDITOR
-        {
-            script->OnDestroy();
-        }
-    }
-
    // Inform attached scripts
    for (int32 i = 0; i < Scripts.Count(); i++)
    {