Ver Fonte

Merge pull request #90670 from timothyqiu/scene-tree-return

[3.x] Fix SceneTree not respecting virtual process methods
lawnjelly há 1 ano atrás
pai
commit
5f7e65ef05
1 ficheiros alterados com 6 adições e 2 exclusões
  1. 6 2
      scene/main/scene_tree.cpp

+ 6 - 2
scene/main/scene_tree.cpp

@@ -579,7 +579,9 @@ bool SceneTree::iteration(float p_time) {
 
 
 	flush_transform_notifications();
 	flush_transform_notifications();
 
 
-	MainLoop::iteration(p_time);
+	if (MainLoop::iteration(p_time)) {
+		_quit = true;
+	}
 	physics_process_time = p_time;
 	physics_process_time = p_time;
 
 
 	emit_signal("physics_frame");
 	emit_signal("physics_frame");
@@ -620,7 +622,9 @@ bool SceneTree::idle(float p_time) {
 
 
 	root_lock++;
 	root_lock++;
 
 
-	MainLoop::idle(p_time);
+	if (MainLoop::idle(p_time)) {
+		_quit = true;
+	}
 
 
 	idle_process_time = p_time;
 	idle_process_time = p_time;