Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-11-16 23:54:05 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-11-16 23:54:05 +0300
commit1d4f3e2a2663206e707b00145cf4f13710e2ccac (patch)
treef1a1f1e4f9e0e4c6cfb6d0e60f870d83f59ed4fb /release
parent457d537fe4f33cfb16e5672404aa9f87797d9d23 (diff)
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
Diffstat (limited to 'release')
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c16
-rw-r--r--release/scripts/presets/interface_theme/blender_light.xml34
2 files changed, 42 insertions, 8 deletions
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>