griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Harley Acheson
2025-10-12 16:30:01 -07:00
parent 6428723a85 6691529dcc
commit 3ad589e973
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/startup/bl_ui/space_outliner.py
View File

@@ -472,7 +472,7 @@ class OUTLINER_PT_filter(Panel):
row.prop(space, "use_filter_view_layers", text="All View Layers") row.prop(space, "use_filter_view_layers", text="All View Layers")
row = col.row() row = col.row()
row.label(icon='OUTLINER_COLLECTION') row.label(icon='GROUP')
row.prop(space, "use_filter_collection", text="Collections") row.prop(space, "use_filter_collection", text="Collections")
row = col.row() row = col.row()

2
scripts/startup/bl_ui/space_properties.py
View File

@@ -17,7 +17,7 @@ tabs_attr_infos = (
("show_properties_view_layer", "View Layer", 'RENDERLAYERS'), ("show_properties_view_layer", "View Layer", 'RENDERLAYERS'),
("show_properties_scene", "Scene", 'SCENE_DATA'), ("show_properties_scene", "Scene", 'SCENE_DATA'),
("show_properties_world", "World", 'WORLD'), ("show_properties_world", "World", 'WORLD'),
("show_properties_collection", "Collection", 'OUTLINER_COLLECTION'), ("show_properties_collection", "Collection", 'GROUP'),
("show_properties_object", "Object", 'OBJECT_DATA'), ("show_properties_object", "Object", 'OBJECT_DATA'),
("show_properties_modifiers", "Modifiers", 'MODIFIER'), ("show_properties_modifiers", "Modifiers", 'MODIFIER'),
("show_properties_effects", "Effects", 'SHADERFX'), ("show_properties_effects", "Effects", 'SHADERFX'),

2
source/blender/editors/interface/interface_icons.cc
View File

@@ -2028,7 +2028,7 @@ int UI_icon_from_idcode(const int idcode)
case ID_GD_LEGACY: case ID_GD_LEGACY:
return ICON_OUTLINER_DATA_GREASEPENCIL; return ICON_OUTLINER_DATA_GREASEPENCIL;
case ID_GR: case ID_GR:
return ICON_OUTLINER_COLLECTION; return ICON_GROUP;
case ID_IM: case ID_IM:
return ICON_IMAGE_DATA; return ICON_IMAGE_DATA;
case ID_LA: case ID_LA: