From 0633a89e1827f42d46e8497754355ef324616945 Mon Sep 17 00:00:00 2001 From: Nathan Craddock Date: Fri, 13 Nov 2020 18:39:19 -0700 Subject: 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. --- source/blender/editors/interface/interface_icons.c | 2 +- source/blender/editors/object/object_edit.c | 2 +- source/blender/editors/space_outliner/outliner_draw.c | 2 +- source/blender/makesrna/intern/rna_ID.c | 2 +- source/blender/makesrna/intern/rna_collection.c | 2 +- source/blender/makesrna/intern/rna_layer.c | 2 +- source/blender/makesrna/intern/rna_space.c | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index fbe61a23d11..68d837ba4b4 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -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: diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index df940d3fa25..ff38bddd040 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -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); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 22bb99530dc..7242d7e0002 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -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; diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index a6084ae6a43..f2c8b1d9e73 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -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", ""}, diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c index df1d7abd6b1..546a3428033 100644 --- a/source/blender/makesrna/intern/rna_collection.c +++ b/source/blender/makesrna/intern/rna_collection.c @@ -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); diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index d3e2445366e..54ee49be65e 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -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); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 3255f335e74..422252d0e95 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -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 | -- cgit v1.2.3