diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-16 14:32:38 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-08-16 14:32:38 +0200 |
| commit | 58020c8e0d4db193ee9bb41cce4133c277383cb3 (patch) | |
| tree | 2aed77a456e8c79ba59731afe42bf0a92fd317c5 /editor/editor_file_system.cpp | |
| parent | 69db19f058ef5720cc05cee9a69944384973a4ad (diff) | |
| parent | 140f9dc3e76c0f99f9d921042ab9362f609429ea (diff) | |
| download | redot-engine-58020c8e0d4db193ee9bb41cce4133c277383cb3.tar.gz | |
Merge pull request #94854 from ianmccleary/custom-resource-icon-fix
Fix custom resources using incorrect icons
Diffstat (limited to 'editor/editor_file_system.cpp')
| -rw-r--r-- | editor/editor_file_system.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index feca12b409..02a95fd836 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -1779,7 +1779,9 @@ String EditorFileSystem::_get_global_script_class(const String &p_type, const St void EditorFileSystem::_update_file_icon_path(EditorFileSystemDirectory::FileInfo *file_info) { String icon_path; - if (file_info->script_class_icon_path.is_empty() && !file_info->deps.is_empty()) { + if (file_info->resource_script_class != StringName()) { + icon_path = EditorNode::get_editor_data().script_class_get_icon_path(file_info->resource_script_class); + } else if (file_info->script_class_icon_path.is_empty() && !file_info->deps.is_empty()) { const String &script_dep = file_info->deps[0]; // Assuming the first dependency is a script. const String &script_path = script_dep.contains("::") ? script_dep.get_slice("::", 2) : script_dep; if (!script_path.is_empty()) { |