From 04fa19fce7512448a5fe3f1a2717781fecf594ee Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Wed, 19 Mar 2025 16:55:05 +0100 Subject: [PATCH] Revert "Fix issue with re-loading scene and toolstip not updating." This reverts commit 3788021898389f64187c66dfeb1a7f1182e08f9f. --- Source/Editor/States/ChangingScenesState.cs | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/Source/Editor/States/ChangingScenesState.cs b/Source/Editor/States/ChangingScenesState.cs index e1a95e6ab..17fa30ff7 100644 --- a/Source/Editor/States/ChangingScenesState.cs +++ b/Source/Editor/States/ChangingScenesState.cs @@ -164,21 +164,10 @@ namespace FlaxEditor.States { Assert.AreEqual(Guid.Empty, _lastSceneFromRequest, "Invalid state."); - // Bind events, only bind loading event and error if re-loading the same scene to avoid issues. - if (_scenesToUnload.Count == 1 && _scenesToLoad.Count == 1) - { - if (_scenesToLoad[0] == _scenesToUnload[0].ID) - { - Level.SceneLoaded += OnSceneEvent; - Level.SceneLoadError += OnSceneEvent; - } - } - else - { - Level.SceneLoaded += OnSceneEvent; - Level.SceneLoadError += OnSceneEvent; - Level.SceneUnloaded += OnSceneEvent; - } + // Bind events + Level.SceneLoaded += OnSceneEvent; + Level.SceneLoadError += OnSceneEvent; + Level.SceneUnloaded += OnSceneEvent; // Push scenes changing requests for (int i = 0; i < _scenesToUnload.Count; i++)