blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 777 Projects 19 Wiki Activity

UI: Remove remaining uses of old collection icon 

After rB452a1c7b3838 there were still a few cases where the old
collection icon was used in the interface. Replace these with the new
filled collection icon.
This commit is contained in:
Nathan Craddock 2020-11-13 18:39:19 -07:00
parent 2e08500d04
commit 0633a89e18
Notes: blender-bot 2023-02-14 03:34:17 +01:00 
Referenced by commit 906ff7b8fe, Fix wrong collection icon in outliner popover
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2265,7 +2265,7 @@ int UI_icon_from_idcode(const int idcode)
case ID_GD:
return ICON_GREASEPENCIL;
case ID_GR:
return ICON_GROUP;
return ICON_OUTLINER_COLLECTION;
case ID_IM:
return ICON_IMAGE_DATA;
case ID_LA:

2
source/blender/editors/object/object_edit.c
View File

@ -451,7 +451,7 @@ static int object_hide_collection_invoke(bContext *C, wmOperator *op, const wmEv
/* Open popup menu. */
const char *title = CTX_IFACE_(op->type->translation_context, op->type->name);
uiPopupMenu *pup = UI_popup_menu_begin(C, title, ICON_GROUP);
uiPopupMenu *pup = UI_popup_menu_begin(C, title, ICON_OUTLINER_COLLECTION);
uiLayout *layout = UI_popup_menu_layout(pup);
ED_collection_hide_menu_draw(C, layout);

2
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -2534,7 +2534,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem *tselem, TreeElement *te)
data.icon = ICON_SCRIPT;
break;
case ID_GR:
data.icon = ICON_GROUP;
data.icon = ICON_OUTLINER_COLLECTION;
break;
case ID_HA:
data.icon = ICON_OUTLINER_DATA_HAIR;

2
source/blender/makesrna/intern/rna_ID.c
View File

@ -52,7 +52,7 @@ const EnumPropertyItem rna_enum_id_type_items[] = {
{ID_CU, "CURVE", ICON_CURVE_DATA, "Curve", ""},
{ID_VF, "FONT", ICON_FONT_DATA, "Font", ""},
{ID_GD, "GREASEPENCIL", ICON_GREASEPENCIL, "Grease Pencil", ""},
{ID_GR, "COLLECTION", ICON_GROUP, "Collection", ""},
{ID_GR, "COLLECTION", ICON_OUTLINER_COLLECTION, "Collection", ""},
{ID_IM, "IMAGE", ICON_IMAGE_DATA, "Image", ""},
{ID_KE, "KEY", ICON_SHAPEKEY_DATA, "Key", ""},
{ID_LA, "LIGHT", ICON_LIGHT_DATA, "Light", ""},

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

@ -407,7 +407,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_GROUP);
RNA_def_struct_ui_icon(srna, ICON_OUTLINER_COLLECTION);
/* This is done on save/load in readfile.c,
* removed if no objects are in the collection and not in a scene. */
RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT);

2
source/blender/makesrna/intern/rna_layer.c
View File

@ -347,7 +347,7 @@ static void rna_def_layer_collection(BlenderRNA *brna)
srna = RNA_def_struct(brna, "LayerCollection", NULL);
RNA_def_struct_ui_text(srna, "Layer Collection", "Layer collection");
RNA_def_struct_ui_icon(srna, ICON_GROUP);
RNA_def_struct_ui_icon(srna, ICON_OUTLINER_COLLECTION);
prop = RNA_def_property(srna, "collection", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL);

4
source/blender/makesrna/intern/rna_space.c
View File

@ -5610,7 +5610,7 @@ static void rna_def_fileselect_idfilter(BlenderRNA *brna)
ICON_GREASEPENCIL,
"Grease Pencil",
"Show Grease pencil data-blocks"},
{FILTER_ID_GR, "filter_group", ICON_GROUP, "Collections", "Show Collection data-blocks"},
{FILTER_ID_GR, "filter_group", ICON_OUTLINER_COLLECTION, "Collections", "Show Collection data-blocks"},
{FILTER_ID_HA, "filter_hair", ICON_HAIR_DATA, "Hairs", "Show/hide Hair data-blocks"},
{FILTER_ID_IM, "filter_image", ICON_IMAGE_DATA, "Images", "Show Image data-blocks"},
{FILTER_ID_LA, "filter_light", ICON_LIGHT_DATA, "Lights", "Show Light data-blocks"},
@ -5684,7 +5684,7 @@ static void rna_def_fileselect_idfilter(BlenderRNA *brna)
{FILTER_ID_AC, "category_animation", ICON_ANIM_DATA, "Animations", "Show animation data"},
{FILTER_ID_OB | FILTER_ID_GR,
"category_object",
ICON_GROUP,
ICON_OUTLINER_COLLECTION,
"Objects & Collections",
"Show objects and collections"},
{FILTER_ID_AR | FILTER_ID_CU | FILTER_ID_LT | FILTER_ID_MB | FILTER_ID_ME | FILTER_ID_HA |