[Bf-blender-cvs] [c8eaede01d7] soc-2020-outliner: Collection: Show color icon for Remove from collection menu

[Nathan Craddock]

Commit: c8eaede01d7cf9407048a0e138a88f0158891830
Author: Nathan Craddock
Date:   Wed Aug 12 16:54:14 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBc8eaede01d7cf9407048a0e138a88f0158891830

Collection: Show color icon for Remove from collection menu

===================================================================

M       source/blender/editors/object/object_collection.c

===================================================================

diff --git a/source/blender/editors/object/object_collection.c 
b/source/blender/editors/object/object_collection.c
index 24f6d8c79f9..5f14cdcd299 100644
--- a/source/blender/editors/object/object_collection.c
+++ b/source/blender/editors/object/object_collection.c
@@ -50,6 +50,8 @@
 #include "RNA_define.h"
 #include "RNA_enum_types.h"
 
+#include "UI_interface_icons.h"
+
 #include "object_intern.h"
 
 /********************* 3d view operators ***********************/
@@ -94,7 +96,7 @@ static const EnumPropertyItem 
*collection_object_active_itemf(bContext *C,
     collection = NULL;
     while ((collection = BKE_collection_object_find(bmain, scene, collection, 
ob))) {
       item_tmp.identifier = item_tmp.name = collection->id.name + 2;
-      /* item_tmp.icon = ICON_ARMATURE_DATA; */
+      item_tmp.icon = UI_collection_color_icon_get(collection);
       item_tmp.value = i;
       RNA_enum_item_add(&item, &totitem, &item_tmp);
       i++;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs