Commit: 15e59f4640fd51f32a33c3f204288317a62d890d
Author: Nathan Craddock
Date: Wed Aug 5 14:44:29 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB15e59f4640fd51f32a33c3f204288317a62d890d
Outliner: Revert back to 6 collection colors
Until better colors are decided on, 6 is plenty.
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/makesrna/intern/rna_collection.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c
b/release/datafiles/userdef/userdef_default_theme.c
index 511f79d50fd..3be019ed166 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1105,9 +1105,6 @@ const bTheme U_theme_default = {
{
.color = RGBA(0xe4312bff),
},
- {
- .color = RGBA(0xe06cb4ff),
- },
{
.color = RGBA(0xef7e42ff),
},
@@ -1118,7 +1115,10 @@ const bTheme U_theme_default = {
.color = RGBA(0x9ac546ff),
},
{
- .color = RGBA(0x2b6114ff),
+ .color = RGBA(0x46bcc2ff),
+ },
+ {
+ .color = RGBA(0x8b65dcff),
},
{
.color = RGBA(0x46bcc2ff),
diff --git a/source/blender/makesrna/intern/rna_collection.c
b/source/blender/makesrna/intern/rna_collection.c
index a9711b576e0..347cd1cc9fd 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -38,10 +38,10 @@ const EnumPropertyItem rna_enum_collection_color_items[] = {
{COLLECTION_COLOR_04, "COLOR_04", ICON_COLLECTION_COLOR_04, "Color 04",
""},
{COLLECTION_COLOR_05, "COLOR_05", ICON_COLLECTION_COLOR_05, "Color 05",
""},
{COLLECTION_COLOR_06, "COLOR_06", ICON_COLLECTION_COLOR_06, "Color 06",
""},
- {COLLECTION_COLOR_07, "COLOR_07", ICON_COLLECTION_COLOR_07, "Color 07",
""},
- {COLLECTION_COLOR_08, "COLOR_08", ICON_COLLECTION_COLOR_08, "Color 08",
""},
- {COLLECTION_COLOR_09, "COLOR_09", ICON_COLLECTION_COLOR_09, "Color 09",
""},
- {COLLECTION_COLOR_10, "COLOR_10", ICON_COLLECTION_COLOR_10, "Color 10",
""},
+ // {COLLECTION_COLOR_07, "COLOR_07", ICON_COLLECTION_COLOR_07, "Color 07",
""},
+ // {COLLECTION_COLOR_08, "COLOR_08", ICON_COLLECTION_COLOR_08, "Color 08",
""},
+ // {COLLECTION_COLOR_09, "COLOR_09", ICON_COLLECTION_COLOR_09, "Color 09",
""},
+ // {COLLECTION_COLOR_10, "COLOR_10", ICON_COLLECTION_COLOR_10, "Color 10",
""},
{0, NULL, 0, NULL, NULL},
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
