diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-17 00:19:11 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-11-17 00:19:11 +0300 |
| commit | 09045ff64d1f0948489354bd097f2930f45bacb9 (patch) | |
| tree | 9c259a8cbced35902f2153ccc020da05c3a57657 /release | |
| parent | 96200110eb0f0c8d2d48b1f383927ab8bd6c4aff (diff) | |
| parent | 906ff7b8fea8ae077c3d3f39ae2c9a2be08b88e5 (diff) | |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/userdef/userdef_default_theme.c | 16 | ||||
| -rw-r--r-- | release/scripts/presets/interface_theme/blender_light.xml | 34 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_outliner.py | 2 |
3 files changed, 43 insertions, 9 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> diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index c61b6218dda..47708db6854 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -370,7 +370,7 @@ class OUTLINER_PT_filter(Panel): col = layout.column(align=True) row = col.row() - row.label(icon='GROUP') + row.label(icon='OUTLINER_COLLECTION') row.prop(space, "use_filter_collection", text="Collections") row = col.row() row.label(icon='OBJECT_DATAMODE') |