Commit: a11a0083b7301153d797644f8a7a13b80de57a83
Author: Nathan Craddock
Date: Fri Aug 14 16:43:14 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rBa11a0083b7301153d797644f8a7a13b80de57a83
Collections: Show icons in search menus
Show in Object Properties > Instancing > Collection and elsewhere.
Remove the link icon in UI_collection_color_icon_get because the link is
redundant in that menu.
===================================================================
M source/blender/editors/interface/interface_icons.c
===================================================================
diff --git a/source/blender/editors/interface/interface_icons.c
b/source/blender/editors/interface/interface_icons.c
index 04117b2d6e0..5e7287eea46 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -2191,6 +2191,9 @@ int ui_id_icon_get(const bContext *C, ID *id, const bool
big)
case ID_SCR:
iconid = ui_id_screen_get_icon(C, id);
break;
+ case ID_GR:
+ iconid = UI_collection_color_icon_get((Collection *)id);
+ break;
default:
break;
}
@@ -2359,9 +2362,6 @@ int UI_collection_color_icon_get(const Collection
*collection)
if (collection->color != COLLECTION_COLOR_NONE) {
icon = ICON_COLLECTION_COLOR_01 + (collection->color - 1);
}
- else if (ID_IS_LINKED(&collection->id)) {
- icon = ICON_LINKED;
- }
return icon;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
