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
This commit is contained in:
Nathan Craddock 2020-11-16 13:54:05 -07:00
parent 457d537fe4
commit 1d4f3e2a26
3 changed files with 45 additions and 8 deletions

View File

@ -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),
},
},
};

View File

@ -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>

View File

@ -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