Merge branch 'Fix-Actor-OnDestroy' of https://github.com/RuanLucasGD/FlaxEngine into RuanLucasGD-Fix-Actor-OnDestroy

2023-10-08 16:41:40 +02:00
parent 38664e9d43 ba20402900
commit c3924d636d
1 changed files with 8 additions and 9 deletions
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -883,6 +883,14 @@ void Actor::EndPlay()
        OnDisable();
    }

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

    // Clear flag
@@ -895,15 +903,6 @@ void Actor::EndPlay()
            Children[i]->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++)
    {