summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-11-22 10:48:14 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-11-22 10:48:14 +0100
commitfafc5c2e56b427c3dd0164e09c54c80e2544f468 (patch)
treebc52691533d777e54f8495f3d716bc5b9c1a640e
parent7022271291a3d2a9cbd6a223d22a29fd775dfc5d (diff)
parent8bebabda1868bb6d0b4f1b144f78c0d1cff8653c (diff)
downloadredot-engine-fafc5c2e56b427c3dd0164e09c54c80e2544f468.tar.gz
Merge pull request #85184 from RandomShaper/switch_scene_better
Let scene replacement benefit from certain late pieces of frame logic
-rw-r--r--scene/main/scene_tree.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index d3347bc304..cf80bd6c6f 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -515,6 +515,10 @@ bool SceneTree::process(double p_time) {
_flush_delete_queue();
+ if (unlikely(pending_new_scene)) {
+ _flush_scene_change();
+ }
+
process_timers(p_time, false); //go through timers
process_tweens(p_time, false);
@@ -550,10 +554,6 @@ bool SceneTree::process(double p_time) {
#endif // _3D_DISABLED
#endif // TOOLS_ENABLED
- if (unlikely(pending_new_scene)) {
- _flush_scene_change();
- }
-
return _quit;
}