From 452a1c7b38383fd3f51532c429912677864e4a33 Mon Sep 17 00:00:00 2001 From: Nathan Craddock Date: Tue, 15 Sep 2020 12:13:03 -0600 Subject: Collections: Add color tagging This adds color tagging to collections. There are 8 color options which are themable in the user preferences, with an additional option for no color tag by default. This adds a new filled collection icon and 8 colored variants of the icon that can be themed in the user preferences. In this commit the only interface to setting the color tags is through Python, and there is nowhere in the interface where the collections are shown colored. Setting and viewing the color tags from the outliner will follow. Manifest Task: https://developer.blender.org/T77777 Differential Revision: https://developer.blender.org/D8622 --- source/blender/editors/include/UI_icons.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/include/UI_icons.h') diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index 452a1fca111..e976aac27a2 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -320,7 +320,7 @@ DEF_ICON_OBJECT(OUTLINER_OB_GROUP_INSTANCE) DEF_ICON_OBJECT(OUTLINER_OB_GREASEPENCIL) DEF_ICON_OBJECT(OUTLINER_OB_LIGHTPROBE) DEF_ICON_OBJECT(OUTLINER_OB_IMAGE) -DEF_ICON_BLANK(321) +DEF_ICON(OUTLINER_COLLECTION) DEF_ICON(RESTRICT_COLOR_OFF) DEF_ICON(RESTRICT_COLOR_ON) DEF_ICON(HIDE_ON) @@ -980,6 +980,15 @@ DEF_ICON_VECTOR(COLORSET_18_VEC) DEF_ICON_VECTOR(COLORSET_19_VEC) DEF_ICON_VECTOR(COLORSET_20_VEC) +DEF_ICON_VECTOR(COLLECTION_COLOR_01) +DEF_ICON_VECTOR(COLLECTION_COLOR_02) +DEF_ICON_VECTOR(COLLECTION_COLOR_03) +DEF_ICON_VECTOR(COLLECTION_COLOR_04) +DEF_ICON_VECTOR(COLLECTION_COLOR_05) +DEF_ICON_VECTOR(COLLECTION_COLOR_06) +DEF_ICON_VECTOR(COLLECTION_COLOR_07) +DEF_ICON_VECTOR(COLLECTION_COLOR_08) + /* Events */ DEF_ICON_COLOR(EVENT_A) DEF_ICON_COLOR(EVENT_B) -- cgit v1.2.3