diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-22 18:38:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-22 18:38:28 +0100 |
commit | 3334a53ac37ea1443adb1ebc03a1a60d82cbbef0 (patch) | |
tree | 7d35031e64f59f1a6d4a66aaac9492cdffbefe47 /editor/filesystem_dock.cpp | |
parent | 07f076fa4f2896415993bb8e3fb42128423de0d2 (diff) | |
parent | 97a3a662205d598dad195fa72d2dcb2f19c21088 (diff) | |
download | redot-engine-3334a53ac37ea1443adb1ebc03a1a60d82cbbef0.tar.gz |
Merge pull request #47166 from reduz/improve-scene-import
Improved 3D Scene Importer
Diffstat (limited to 'editor/filesystem_dock.cpp')
-rw-r--r-- | editor/filesystem_dock.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 43bfccc656..772eff5f45 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -945,7 +945,25 @@ void FileSystemDock::_select_file(const String &p_path, bool p_select_in_favorit } } else if (fpath != "Favorites") { if (ResourceLoader::get_resource_type(fpath) == "PackedScene") { - editor->open_request(fpath); + bool is_imported = false; + + { + List<String> importer_exts; + ResourceImporterScene::get_singleton()->get_recognized_extensions(&importer_exts); + String extension = fpath.get_extension(); + for (List<String>::Element *E = importer_exts.front(); E; E = E->next()) { + if (extension.nocasecmp_to(E->get())) { + is_imported = true; + break; + } + } + } + + if (is_imported) { + ResourceImporterScene::get_singleton()->show_advanced_options(fpath); + } else { + editor->open_request(fpath); + } } else { editor->load_resource(fpath); } |