From 6691529dccf4ab9c89f3cc59c3b93e9418976981 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Mon, 13 Oct 2025 01:26:16 +0200 Subject: [PATCH] Fix #147926: Incorrect Icon used for Generic Collection We have icons that represent specific individual collections. like Icon_Outliner_Collection for a default (uncolored) collection, and Icon_Collection_color_x for ones with colors. For "collections" as a general thing though we have icon_group. Sometimes we confuse the two, for example the list of tabs to show in Properties uses a different icon than the actual category icon. This PR fixes the complaint by using the correct icon for each of these purposes. Pull Request: https://projects.blender.org/blender/blender/pulls/147942 --- scripts/startup/bl_ui/space_outliner.py | 2 +- scripts/startup/bl_ui/space_properties.py | 2 +- source/blender/editors/interface/interface_icons.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/startup/bl_ui/space_outliner.py b/scripts/startup/bl_ui/space_outliner.py index 669860b72a3..87102b13ef9 100644 --- a/scripts/startup/bl_ui/space_outliner.py +++ b/scripts/startup/bl_ui/space_outliner.py @@ -472,7 +472,7 @@ class OUTLINER_PT_filter(Panel): row.prop(space, "use_filter_view_layers", text="All View Layers") row = col.row() - row.label(icon='OUTLINER_COLLECTION') + row.label(icon='GROUP') row.prop(space, "use_filter_collection", text="Collections") row = col.row() diff --git a/scripts/startup/bl_ui/space_properties.py b/scripts/startup/bl_ui/space_properties.py index 280b970f657..efed8e7421f 100644 --- a/scripts/startup/bl_ui/space_properties.py +++ b/scripts/startup/bl_ui/space_properties.py @@ -17,7 +17,7 @@ tab_list = [ ("show_properties_view_layer", "View Layer", 'RENDERLAYERS'), ("show_properties_scene", "Scene", 'SCENE_DATA'), ("show_properties_world", "World", 'WORLD'), - ("show_properties_collection", "Collection", 'OUTLINER_COLLECTION'), + ("show_properties_collection", "Collection", 'GROUP'), ("show_properties_object", "Object", 'OBJECT_DATA'), ("show_properties_modifiers", "Modifiers", 'MODIFIER'), ("show_properties_effects", "Effects", 'SHADERFX'), diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index a25d66161d6..6f3e35e1215 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -2028,7 +2028,7 @@ int UI_icon_from_idcode(const int idcode) case ID_GD_LEGACY: return ICON_OUTLINER_DATA_GREASEPENCIL; case ID_GR: - return ICON_OUTLINER_COLLECTION; + return ICON_GROUP; case ID_IM: return ICON_IMAGE_DATA; case ID_LA: