diff --git a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp index 5d6eb5feba..db2b4f97b6 100644 --- a/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp +++ b/modules/fbx/editor/editor_scene_importer_fbx2gltf.cpp @@ -144,10 +144,4 @@ void EditorSceneFormatImporterFBX2GLTF::handle_compatibility_options(HashMappush_back(ResourceImporterScene::ImportOption(PropertyInfo(Variant::INT, "gltf/naming_version", PROPERTY_HINT_ENUM, "Godot 4.0 or 4.1,Godot 4.2 to 4.4,Godot 4.5 or later"), 2)); } -void EditorSceneFormatImporterBlend::handle_compatibility_options(HashMap &p_import_params) const { - if (!p_import_params.has("gltf/naming_version")) { - // If a .blend's existing import file is missing the glTF - // naming compatibility version, we need to use version 1. - // Version 1 is the behavior before this option was added. - p_import_params["gltf/naming_version"] = 1; - } -} - /////////////////////////// static bool _test_blender_path(const String &p_path, String *r_err = nullptr) { diff --git a/modules/gltf/editor/editor_scene_importer_blend.h b/modules/gltf/editor/editor_scene_importer_blend.h index 3e703f20e2..66afcae8c3 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.h +++ b/modules/gltf/editor/editor_scene_importer_blend.h @@ -73,7 +73,6 @@ public: List *r_options) override; virtual Variant get_option_visibility(const String &p_path, const String &p_scene_import_type, const String &p_option, const HashMap &p_options) override; - virtual void handle_compatibility_options(HashMap &p_import_params) const override; }; class LineEdit; diff --git a/modules/gltf/editor/editor_scene_importer_gltf.cpp b/modules/gltf/editor/editor_scene_importer_gltf.cpp index f8c6d775a1..2b5249cf33 100644 --- a/modules/gltf/editor/editor_scene_importer_gltf.cpp +++ b/modules/gltf/editor/editor_scene_importer_gltf.cpp @@ -89,14 +89,6 @@ void EditorSceneFormatImporterGLTF::get_import_options(const String &p_path, } } -void EditorSceneFormatImporterGLTF::handle_compatibility_options(HashMap &p_import_params) const { - if (!p_import_params.has("gltf/naming_version")) { - // If an existing import file is missing the glTF - // compatibility version, we need to use version 0. - p_import_params["gltf/naming_version"] = 0; - } -} - Variant EditorSceneFormatImporterGLTF::get_option_visibility(const String &p_path, const String &p_scene_import_type, const String &p_option, const HashMap &p_options) { return true; diff --git a/modules/gltf/editor/editor_scene_importer_gltf.h b/modules/gltf/editor/editor_scene_importer_gltf.h index c62367bc92..50c2d3ceb5 100644 --- a/modules/gltf/editor/editor_scene_importer_gltf.h +++ b/modules/gltf/editor/editor_scene_importer_gltf.h @@ -45,7 +45,6 @@ public: List *r_missing_deps, Error *r_err = nullptr) override; virtual void get_import_options(const String &p_path, List *r_options) override; - virtual void handle_compatibility_options(HashMap &p_import_params) const override; virtual Variant get_option_visibility(const String &p_path, const String &p_scene_import_type, const String &p_option, const HashMap &p_options) override; };