Преглед на файлове

Merge pull request #85184 from RandomShaper/switch_scene_better

Let scene replacement benefit from certain late pieces of frame logic
Rémi Verschelde преди 1 година
родител
ревизия
fafc5c2e56
променени са 1 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. 4 4
      scene/main/scene_tree.cpp

+ 4 - 4
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;
 }