[Bf-blender-cvs] [982e7950132] soc-2020-outliner: Collection Colors: Add 4 new color slots

[Nathan Craddock]

Commit: 982e7950132ed77038ba2023c40a252379706438
Author: Nathan Craddock
Date:   Wed Jul 15 17:08:03 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB982e7950132ed77038ba2023c40a252379706438

Collection Colors: Add 4 new color slots

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

M       release/datafiles/userdef/userdef_default_theme.c
M       source/blender/editors/include/UI_icons.h
M       source/blender/editors/interface/interface_icons.c
M       source/blender/makesdna/DNA_collection_types.h
M       source/blender/makesdna/DNA_userdef_types.h
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 0fd262f0c14..e8daebf7ee9 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1120,6 +1120,18 @@ const bTheme U_theme_default = {
     {
       .color = RGBA(0x8b65dcff),
     },
+    {
+      .color = RGBA(0x8b65dcff),
+    },
+    {
+      .color = RGBA(0x8b65dcff),
+    },
+    {
+      .color = RGBA(0x8b65dcff),
+    },
+    {
+      .color = RGBA(0x8b65dcff),
+    },
   },
 };
 
diff --git a/source/blender/editors/include/UI_icons.h 
b/source/blender/editors/include/UI_icons.h
index e514a2013ea..6a9d4a81c98 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -986,6 +986,10 @@ 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)
+DEF_ICON_VECTOR(COLLECTION_COLOR_09)
+DEF_ICON_VECTOR(COLLECTION_COLOR_10)
 
 /* Events  */
 DEF_ICON_COLOR(EVENT_A)
diff --git a/source/blender/editors/interface/interface_icons.c 
b/source/blender/editors/interface/interface_icons.c
index e9979ffecc9..7a95af06f31 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -491,6 +491,10 @@ DEF_ICON_COLLECTION_COLOR_DRAW(03, COLLECTION_COLOR_03);
 DEF_ICON_COLLECTION_COLOR_DRAW(04, COLLECTION_COLOR_04);
 DEF_ICON_COLLECTION_COLOR_DRAW(05, COLLECTION_COLOR_05);
 DEF_ICON_COLLECTION_COLOR_DRAW(06, COLLECTION_COLOR_06);
+DEF_ICON_COLLECTION_COLOR_DRAW(07, COLLECTION_COLOR_07);
+DEF_ICON_COLLECTION_COLOR_DRAW(08, COLLECTION_COLOR_08);
+DEF_ICON_COLLECTION_COLOR_DRAW(09, COLLECTION_COLOR_09);
+DEF_ICON_COLLECTION_COLOR_DRAW(10, COLLECTION_COLOR_10);
 
 #  undef DEF_ICON_COLLECTION_COLOR_DRAW
 
@@ -1052,6 +1056,10 @@ static void init_internal_icons(void)
   def_internal_vicon(ICON_COLLECTION_COLOR_04, vicon_collection_color_draw_04);
   def_internal_vicon(ICON_COLLECTION_COLOR_05, vicon_collection_color_draw_05);
   def_internal_vicon(ICON_COLLECTION_COLOR_06, vicon_collection_color_draw_06);
+  def_internal_vicon(ICON_COLLECTION_COLOR_07, vicon_collection_color_draw_07);
+  def_internal_vicon(ICON_COLLECTION_COLOR_08, vicon_collection_color_draw_08);
+  def_internal_vicon(ICON_COLLECTION_COLOR_09, vicon_collection_color_draw_09);
+  def_internal_vicon(ICON_COLLECTION_COLOR_10, vicon_collection_color_draw_10);
 }
 #  endif /* WITH_HEADLESS */
 
diff --git a/source/blender/makesdna/DNA_collection_types.h 
b/source/blender/makesdna/DNA_collection_types.h
index 28185fc3d86..68622bb6e26 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -105,6 +105,10 @@ enum {
   COLLECTION_COLOR_04 = 4,
   COLLECTION_COLOR_05 = 5,
   COLLECTION_COLOR_06 = 6,
+  COLLECTION_COLOR_07 = 7,
+  COLLECTION_COLOR_08 = 8,
+  COLLECTION_COLOR_09 = 9,
+  COLLECTION_COLOR_10 = 10,
 };
 
 #endif /* __DNA_COLLECTION_TYPES_H__ */
diff --git a/source/blender/makesdna/DNA_userdef_types.h 
b/source/blender/makesdna/DNA_userdef_types.h
index c491ea96762..786c000d073 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -498,7 +498,7 @@ typedef struct bTheme {
   ThemeWireColor tarm[20];
   /*ThemeWireColor tobj[20];*/
 
-  ThemeCollectionColor collection_color[6];
+  ThemeCollectionColor collection_color[10];
 
   int active_theme_area;
   char _pad0[4];
diff --git a/source/blender/makesrna/intern/rna_collection.c 
b/source/blender/makesrna/intern/rna_collection.c
index c10a24d95b2..a9711b576e0 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -38,6 +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", 
""},
     {0, NULL, 0, NULL, NULL},
 };

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