diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-03-03 13:10:06 +0100 |
|---|---|---|
| committer | Yuri Sizov <yuris@humnom.net> | 2023-03-14 13:59:02 +0100 |
| commit | 7e74568709532181be3e803d64d22b8a03a45a9a (patch) | |
| tree | ae85c64d5945ee9319bcca212d6fda56a38f6c0c /modules | |
| parent | 278fc7538dbd98ff0e06410d69adca49b5326b21 (diff) | |
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.
(cherry picked from commit d81e6ee024a8c64b80ac25c96b33c749ba1db79d)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gltf/register_types.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gltf/register_types.cpp b/modules/gltf/register_types.cpp index 78589090db..4754c316a1 100644 --- a/modules/gltf/register_types.cpp +++ b/modules/gltf/register_types.cpp @@ -143,8 +143,8 @@ void initialize_gltf_module(ModuleInitializationLevel p_level) { EditorPlugins::add_by_type<SceneExporterGLTFPlugin>(); // Project settings defined here so doctool finds them. - GLOBAL_DEF_RST("filesystem/import/blender/enabled", true); - GLOBAL_DEF_RST("filesystem/import/fbx/enabled", true); + GLOBAL_DEF_RST_BASIC("filesystem/import/blender/enabled", true); + GLOBAL_DEF_RST_BASIC("filesystem/import/fbx/enabled", true); GDREGISTER_CLASS(EditorSceneFormatImporterBlend); GDREGISTER_CLASS(EditorSceneFormatImporterFBX); // Can't (a priori) run external app on these platforms. |