diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2023-01-19 19:12:25 +0100 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2023-01-21 14:19:27 +0100 |
| commit | dddd8d43f618874642a228800187fb0912c46c20 (patch) | |
| tree | ffb66d3db3d61157b119b0e1610a558170f506af /editor/editor_quick_open.cpp | |
| parent | 14fdd28de9f1f9979cb6cffa4b715a16d406439d (diff) | |
| download | redot-engine-dddd8d43f618874642a228800187fb0912c46c20.tar.gz | |
Support script global resource name in EditorFileSystem
* Works for binary and text files.
* Makes EditorQuickOpen work with custom resources again.
* Information is cached and easily accessible.
Properly fixes #66179. Supersedes #66215 and supersedes #62417
**WARNING**: This required breaking backwards binary compatibility (.res and .scn files). Files saved after this PR is merged will no longer open in any earlier versions of Godot.
Diffstat (limited to 'editor/editor_quick_open.cpp')
| -rw-r--r-- | editor/editor_quick_open.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/editor/editor_quick_open.cpp b/editor/editor_quick_open.cpp index d516610908..b90edb8f90 100644 --- a/editor/editor_quick_open.cpp +++ b/editor/editor_quick_open.cpp @@ -69,17 +69,9 @@ void EditorQuickOpen::_build_search_cache(EditorFileSystemDirectory *p_efsd) { for (int i = 0; i < p_efsd->get_file_count(); i++) { String file = p_efsd->get_file_path(i); String engine_type = p_efsd->get_file_type(i); - // TODO: Fix lack of caching for resource's script's global class name (if applicable). - String script_type; - if (_load_resources) { - Ref<Resource> res = ResourceLoader::load(file); - if (res.is_valid()) { - Ref<Script> scr = res->get_script(); - if (scr.is_valid()) { - script_type = scr->get_language()->get_global_class_name(file); - } - } - } + + String script_type = p_efsd->get_file_resource_script_class(i); + String actual_type = script_type.is_empty() ? engine_type : script_type; // Iterate all possible base types. for (String &parent_type : base_types) { |