Commit: 214223e864217c215f9e07327ef63faf902fbabc
Author: Nathan Craddock
Date: Wed Aug 5 21:30:44 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB214223e864217c215f9e07327ef63faf902fbabc
Outliner: Use solid collection icon
Switch to the solid collection icon (already on the sheet) for the
collection colors. Perhaps use the solid for colored collections, and
the lines for non-colored?
===================================================================
A release/datafiles/blender_icons16/icon16_outliner_collection.dat
A release/datafiles/blender_icons32/icon32_outliner_collection.dat
M source/blender/editors/include/UI_icons.h
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/release/datafiles/blender_icons16/icon16_outliner_collection.dat
b/release/datafiles/blender_icons16/icon16_outliner_collection.dat
new file mode 100644
index 00000000000..c46a6ce6f66
Binary files /dev/null and
b/release/datafiles/blender_icons16/icon16_outliner_collection.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_outliner_collection.dat
b/release/datafiles/blender_icons32/icon32_outliner_collection.dat
new file mode 100644
index 00000000000..0fdd735553e
Binary files /dev/null and
b/release/datafiles/blender_icons32/icon32_outliner_collection.dat differ
diff --git a/source/blender/editors/include/UI_icons.h
b/source/blender/editors/include/UI_icons.h
index 6a9d4a81c98..b40fe2081f0 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)
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index d2a10732af6..966ee81cc33 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -2522,7 +2522,7 @@ TreeElementIcon tree_element_get_icon(TreeStoreElem
*tselem, TreeElement *te)
data.drag_parent = (data.drag_id && te->parent) ?
TREESTORE(te->parent)->id : NULL;
}
- data.icon = ICON_GROUP;
+ data.icon = ICON_OUTLINER_COLLECTION;
break;
}
case TSE_GP_LAYER: {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
