Commit: 576028db533a04d27fe12d6d6d967f8a84941027
Author: Nathan Craddock
Date: Thu Aug 13 17:12:31 2020 -0600
Branches: soc-2020-outliner
https://developer.blender.org/rB576028db533a04d27fe12d6d6d967f8a84941027
Collections: Use 8 colors for color tagging
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/blenloader/intern/versioning_userdef.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 3be019ed166..1fbde066ef6 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1121,16 +1121,10 @@ const bTheme U_theme_default = {
.color = RGBA(0x8b65dcff),
},
{
- .color = RGBA(0x46bcc2ff),
- },
- {
- .color = RGBA(0x0a3695ff),
- },
- {
- .color = RGBA(0x8b65dcff),
+ .color = RGBA(0x999999ff),
},
{
- .color = RGBA(0x4b707cff),
+ .color = RGBA(0x06d4432ff),
},
},
};
diff --git a/source/blender/blenloader/intern/versioning_userdef.c
b/source/blender/blenloader/intern/versioning_userdef.c
index 70a032ae8b3..606cbc34600 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -222,6 +222,8 @@ static void do_versions_theme(const UserDef *userdef,
bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(collection_color[3].color);
FROM_DEFAULT_V4_UCHAR(collection_color[4].color);
FROM_DEFAULT_V4_UCHAR(collection_color[5].color);
+ FROM_DEFAULT_V4_UCHAR(collection_color[6].color);
+ FROM_DEFAULT_V4_UCHAR(collection_color[7].color);
/**
* Versioning code until next subversion bump goes here.
diff --git a/source/blender/editors/include/UI_icons.h
b/source/blender/editors/include/UI_icons.h
index b40fe2081f0..e976aac27a2 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -988,8 +988,6 @@ 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 46c962b9305..e269dd025a1 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -494,8 +494,6 @@ 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
@@ -1033,8 +1031,6 @@ static void init_internal_icons(void)
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 ef1a67d0b04..1584642b449 100644
--- a/source/blender/makesdna/DNA_collection_types.h
+++ b/source/blender/makesdna/DNA_collection_types.h
@@ -106,6 +106,4 @@ enum {
COLLECTION_COLOR_06 = 6,
COLLECTION_COLOR_07 = 7,
COLLECTION_COLOR_08 = 8,
- COLLECTION_COLOR_09 = 9,
- COLLECTION_COLOR_10 = 10,
};
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index 60354ec47fb..485a53d14b9 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -497,7 +497,7 @@ typedef struct bTheme {
ThemeWireColor tarm[20];
/*ThemeWireColor tobj[20];*/
- ThemeCollectionColor collection_color[10];
+ ThemeCollectionColor collection_color[8];
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 347cd1cc9fd..ecf7adfa925 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -38,10 +38,8 @@ 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",
""},
{0, NULL, 0, NULL, NULL},
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
