[Bf-blender-cvs] [1d4f3e2a266] blender-v2.91-release: Outliner: Collection icon color tweaks
Nathan Craddock
noreply at git.blender.org
Mon Nov 16 22:18:21 CET 2020
Commit: 1d4f3e2a2663206e707b00145cf4f13710e2ccac
Author: Nathan Craddock
Date: Mon Nov 16 13:54:05 2020 -0700
Branches: blender-v2.91-release
https://developer.blender.org/rB1d4f3e2a2663206e707b00145cf4f13710e2ccac
Outliner: Collection icon color tweaks
The icons originally chosen for the collection colors were selected
during development and had a few issues with contrast in the light
theme, and the gray color was not a good choice against the default gray
backgrounds.
The new colors are more readable in both default Blender themes. Gray
was replaced with pink.
Differential Revision: https://developer.blender.org/D9504
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/presets/interface_theme/blender_light.xml
M source/blender/blenloader/intern/versioning_userdef.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 4d0442c8f75..bdbd8386856 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -1108,28 +1108,28 @@ const bTheme U_theme_default = {
},
.collection_color = {
{
- .color = RGBA(0xe4312bff),
+ .color = RGBA(0xe2605bff),
},
{
- .color = RGBA(0xef7e42ff),
+ .color = RGBA(0xf1a355ff),
},
{
- .color = RGBA(0xe4dd52ff),
+ .color = RGBA(0xf1dc55ff),
},
{
- .color = RGBA(0x9ac546ff),
+ .color = RGBA(0x7bcc7bff),
},
{
- .color = RGBA(0x46bcc2ff),
+ .color = RGBA(0x5db6eaff),
},
{
- .color = RGBA(0x8b65dcff),
+ .color = RGBA(0x8d59daff),
},
{
- .color = RGBA(0x999999ff),
+ .color = RGBA(0xc673b8ff),
},
{
- .color = RGBA(0x06d4432ff),
+ .color = RGBA(0x7a5441ff),
},
},
};
diff --git a/release/scripts/presets/interface_theme/blender_light.xml b/release/scripts/presets/interface_theme/blender_light.xml
index a5671ee0fbe..7c9b769e806 100644
--- a/release/scripts/presets/interface_theme/blender_light.xml
+++ b/release/scripts/presets/interface_theme/blender_light.xml
@@ -1454,6 +1454,40 @@
>
</ThemeBoneColorSet>
</bone_color_sets>
+ <collection_color>
+ <ThemeCollectionColor
+ color="#dd473f"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#e5a057"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#e4d050"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#3fb931"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#3887c7"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#844fcd"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#c169b5"
+ >
+ </ThemeCollectionColor>
+ <ThemeCollectionColor
+ color="#7a5441"
+ >
+ </ThemeCollectionColor>
+ </collection_color>
</Theme>
<ThemeStyle>
<panel_title>
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 6b6d226bd90..f76fac23e96 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -257,6 +257,9 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
*/
{
/* Keep this block, even when empty. */
+ for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) {
+ FROM_DEFAULT_V4_UCHAR(collection_color[i].color);
+ }
}
#undef FROM_DEFAULT_V4_UCHAR
More information about the Bf-blender-cvs
mailing list