Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-11-14 04:39:19 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-11-14 06:28:28 +0300
commit0633a89e1827f42d46e8497754355ef324616945 (patch)
tree29ee044d146e88d0a7b579bb579cfdc22514a5e3 /source/blender/editors
parent2e08500d047e830ceeb651466cae0140d31fe9a4 (diff)
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.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_icons.c2
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c2
3 files changed, 3 insertions, 3 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;