diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-20 11:12:11 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-02-20 11:12:11 +0100 |
| commit | b7145638d5b235e8e1b2fe039a0cee48a4bbb26d (patch) | |
| tree | 1b7208f80f335449f3a72bf9b4f82e4927453b8e | |
| parent | 07254d9b1b88ba3a4af0c36d8d937f9042bac020 (diff) | |
| parent | bb461986ba2c98e210658b5669df106d2720ff85 (diff) | |
| download | redot-engine-b7145638d5b235e8e1b2fe039a0cee48a4bbb26d.tar.gz | |
Merge pull request #88523 from KoBeWi/open_text_as_text
Add separate program case for Godot Resources
| -rw-r--r-- | editor/filesystem_dock.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index ac83460542..abec361ea6 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -2066,13 +2066,18 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected fpath = p_selected[0]; } - String file = ProjectSettings::get_singleton()->globalize_path(fpath); + const String file = ProjectSettings::get_singleton()->globalize_path(fpath); + const String extension = file.get_extension(); - String resource_type = ResourceLoader::get_resource_type(fpath); + const String resource_type = ResourceLoader::get_resource_type(fpath); String external_program; - if (resource_type == "CompressedTexture2D" || resource_type == "Image") { - if (file.get_extension() == "svg" || file.get_extension() == "svgz") { + if (ClassDB::is_parent_class(resource_type, "Script") || extension == "tres" || extension == "tscn") { + external_program = EDITOR_GET("text_editor/external/exec_path"); + } else if (extension == "res" || extension == "scn") { + // Binary resources have no meaningful editor outside Godot, so just fallback to something default. + } else if (resource_type == "CompressedTexture2D" || resource_type == "Image") { + if (extension == "svg" || extension == "svgz") { external_program = EDITOR_GET("filesystem/external_programs/vector_image_editor"); } else { external_program = EDITOR_GET("filesystem/external_programs/raster_image_editor"); @@ -2080,12 +2085,7 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected } else if (ClassDB::is_parent_class(resource_type, "AudioStream")) { external_program = EDITOR_GET("filesystem/external_programs/audio_editor"); } else if (resource_type == "PackedScene") { - // Ignore non-model scenes. - if (file.get_extension() != "tscn" && file.get_extension() != "scn" && file.get_extension() != "res") { - external_program = EDITOR_GET("filesystem/external_programs/3d_model_editor"); - } - } else if (ClassDB::is_parent_class(resource_type, "Script")) { - external_program = EDITOR_GET("text_editor/external/exec_path"); + external_program = EDITOR_GET("filesystem/external_programs/3d_model_editor"); } if (external_program.is_empty()) { |