Change OnDestroy order

2023-09-28 19:05:26 -04:00
parent 409b17df2d
commit ba20402900
1 changed files with 6 additions and 7 deletions
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -877,6 +877,12 @@ void Actor::EndPlay()
 #endif

    // Fire event for scripting
+    if (IsActiveInHierarchy() && GetScene())
+    {
+        ASSERT(GetScene());
+        OnDisable();
+    }
+
    for (auto* script : Scripts)
    {
        CHECK_EXECUTE_IN_EDITOR
@@ -885,13 +891,6 @@ void Actor::EndPlay()
        }
    }

-    // Fire event for scripting
-    if (IsActiveInHierarchy() && GetScene())
-    {
-        ASSERT(GetScene());
-        OnDisable();
-    }
-
    OnEndPlay();

    // Clear flag