Overhaul the SurfaceUpgradeTool

This defers the update to a fresh restart of the editor (to ensure we aren't mid way through loading scenes anymore.

It also ensures that the popup can't be used by multiple threads at once

Co-authored-by: Yuri Sizov <yuris@humnom.net>

1 files changed, 22 insertions, 4 deletions

diff --git a/editor/surface_upgrade_tool.h b/editor/surface_upgrade_tool.h
index fa052200d8..70e07c58a1 100644
--- a/editor/surface_upgrade_tool.h
+++ b/editor/surface_upgrade_tool.h
@@ -35,13 +35,31 @@
 
 class EditorFileSystemDirectory;
 
-class SurfaceUpgradeTool {
-	static void upgrade_all_meshes();
+class SurfaceUpgradeTool : public Object {
+	GDCLASS(SurfaceUpgradeTool, Object);
 
-	static void _show_popup();
-	static void _add_files(EditorFileSystemDirectory *p_dir, HashSet<String> &r_paths, PackedStringArray &r_files);
+	static SurfaceUpgradeTool *singleton;
+
+	bool show_requested = false;
+	bool popped_up = false;
+	Mutex mutex;
+
+	static void _try_show_popup();
+	void _show_popup();
+	void _add_files(EditorFileSystemDirectory *p_dir, Vector<String> &r_reimport_paths, Vector<String> &r_resave_paths);
+
+protected:
+	static void _bind_methods();
 
 public:
+	static SurfaceUpgradeTool *get_singleton() { return singleton; };
+
+	bool is_show_requested() const { return show_requested; };
+	void show_popup() { _show_popup(); }
+
+	void begin_upgrade();
+	void finish_upgrade();
+
 	SurfaceUpgradeTool();
 	~SurfaceUpgradeTool();
 };