From d81e6ee024a8c64b80ac25c96b33c749ba1db79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 3 Mar 2023 13:10:06 +0100 Subject: FBX: Disable importer when canceling FBX2glTF setup Pretty hacky solution but it's better than an infinite loop. All this import setup needs to be redone, it's very difficult to properly bail out from an invalid import without triggering reimport loops. Also fix underline not visible at default editor scale in LinkButton. Fixes #73319. --- editor/fbx_importer_manager.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'editor/fbx_importer_manager.h') diff --git a/editor/fbx_importer_manager.h b/editor/fbx_importer_manager.h index ed0a96337e..dd5fcfd16e 100644 --- a/editor/fbx_importer_manager.h +++ b/editor/fbx_importer_manager.h @@ -38,6 +38,8 @@ class FBXImporterManager : public ConfirmationDialog { GDCLASS(FBXImporterManager, ConfirmationDialog) + bool is_importing = false; + Label *message = nullptr; LineEdit *fbx_path = nullptr; Button *fbx_path_browse = nullptr; @@ -47,6 +49,7 @@ class FBXImporterManager : public ConfirmationDialog { void _validate_path(const String &p_path); void _select_file(const String &p_path); void _path_confirmed(); + void _cancel_setup(); void _browse_install(); void _link_clicked(); -- cgit v1.2.3