Merge pull request #90784 from KoBeWi/progressive_progress

Don't show scene group progress for 1 scene
godotengine · Apr 17, 2024 · 5a502a6 · 5a502a6
2 parents ab24edc + 5883300
commit 5a502a6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp
@@ -1664,7 +1664,10 @@ void EditorFileSystem::_queue_update_script_class(const String &p_path) {
 }
 
 void EditorFileSystem::_update_scene_groups() {
-	EditorProgress ep("update_scene_groups", TTR("Update Scene Groups"), update_scene_paths.size());
+	EditorProgress *ep = nullptr;
+	if (update_scene_paths.size() > 1) {
+		ep = memnew(EditorProgress("update_scene_groups", TTR("Update Scene Groups"), update_scene_paths.size()));
+	}
 	int step_count = 0;
 
 	update_scene_mutex.lock();
@@ -1684,9 +1687,12 @@ void EditorFileSystem::_update_scene_groups() {
 			ProjectSettings::get_singleton()->add_scene_groups_cache(path, scene_groups);
 		}
 
-		ep.step(TTR("Updating Scene Groups..."), step_count++);
+		if (ep) {
+			ep->step(TTR("Updating Scene Groups..."), step_count++);
+		}
 	}
 
+	memdelete_notnull(ep);
 	update_scene_paths.clear();
 	update_scene_mutex.unlock();