Skip to content

Commit

Permalink
Merge pull request godotengine#97112 from KoBeWi/image_not_found
Browse files Browse the repository at this point in the history
Fix generic conversion icon
  • Loading branch information
akien-mga committed Sep 17, 2024
2 parents 27dacd5 + 514bbbf commit 71b3221
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion editor/editor_resource_picker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ void EditorResourcePicker::_update_menu_items() {
if (has_theme_icon(what, EditorStringName(EditorIcons))) {
icon = get_editor_theme_icon(what);
} else {
icon = get_theme_icon(what, SNAME("Resource"));
icon = get_editor_theme_icon(SNAME("Object"));
}

edit_menu->add_icon_item(icon, vformat(TTR("Convert to %s"), what), CONVERT_BASE_ID + relative_id);
Expand Down
2 changes: 1 addition & 1 deletion editor/filesystem_dock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3414,7 +3414,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, const Vect
if (has_theme_icon(E, SNAME("EditorIcons"))) {
icon = get_editor_theme_icon(E);
} else {
icon = get_editor_theme_icon(SNAME("Resource"));
icon = get_editor_theme_icon(SNAME("Object"));
}

container_menu->add_icon_item(icon, vformat(TTR(conversion_string_template), E), CONVERT_BASE_ID + relative_id);
Expand Down

0 comments on commit 71b3221

Please sign in to comment.