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-08 14:05:47 -07:00
parent 8dcbf4a527 2eaac0ad74
commit 33457d8723
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_properties.py
View File

@@ -112,7 +112,7 @@ class PROPERTIES_PT_options(Panel):
("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'),

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

@@ -1379,7 +1379,7 @@ class USERPREF_PT_theme_collection_colors(ThemePanel, CenterAlignMixIn, Panel):
def draw_header(self, _context):
layout = self.layout
layout.label(icon='OUTLINER_COLLECTION')
layout.label(icon='GROUP')
def draw_centered(self, context, layout):
theme = context.preferences.themes[0]

2
source/blender/makesrna/intern/rna_collection.cc
View File

@@ -827,7 +827,7 @@ void RNA_def_collections(BlenderRNA *brna)
srna = RNA_def_struct(brna, "Collection", "ID");
RNA_def_struct_ui_text(srna, "Collection", "Collection of Object data-blocks");
RNA_def_struct_ui_icon(srna, ICON_OUTLINER_COLLECTION);
RNA_def_struct_ui_icon(srna, ICON_GROUP);
/* This is done on save/load in `readfile.cc`,
* removed if no objects are in the collection and not in a scene. */
RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);