From ab348d5f34ab2615a54f8e12a3da3908bc5aea1b Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Fri, 28 Mar 2025 15:35:38 +0100 Subject: [PATCH] Fix incorrect scene object memory leak printing if some objects are destroyed during game plugin shutdown --- Source/Editor/States/PlayingState.cs | 2 ++ Source/Editor/Utilities/DuplicateScenes.cs | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/States/PlayingState.cs b/Source/Editor/States/PlayingState.cs index 9da71a967..9390b1a10 100644 --- a/Source/Editor/States/PlayingState.cs +++ b/Source/Editor/States/PlayingState.cs @@ -195,6 +195,8 @@ namespace FlaxEditor.States SceneRestoring?.Invoke(); _duplicateScenes.UnloadScenes(); PluginManager.Internal_DeinitializeGamePlugins(); + FlaxEngine.Scripting.FlushRemovedObjects(); + Editor.WipeOutLeftoverSceneObjects(); Editor.Internal_SetPlayMode(false); _duplicateScenes.RestoreSceneData(); SceneRestored?.Invoke(); diff --git a/Source/Editor/Utilities/DuplicateScenes.cs b/Source/Editor/Utilities/DuplicateScenes.cs index 37b5bf824..ba1c5a941 100644 --- a/Source/Editor/Utilities/DuplicateScenes.cs +++ b/Source/Editor/Utilities/DuplicateScenes.cs @@ -144,8 +144,6 @@ namespace FlaxEditor.Utilities Editor.LogError("Failed to unload scenes."); return; } - FlaxEngine.Scripting.FlushRemovedObjects(); - Editor.WipeOutLeftoverSceneObjects(); Profiler.EndEvent(); }