blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Merge branch 'blender-v2.91-release'

This commit is contained in:
Nathan Craddock 2020-11-16 14:19:11 -07:00
parent 96200110eb 906ff7b8fe
commit 09045ff64d
Notes: blender-bot 2023-02-14 02:43:21 +01:00 
Referenced by issue #82775, Wacom tablet (Intuos Pro Medium) support is broken in 2.92.0 Alpha but works fine in 2.91.0 Beta (builds from Nov 16)
4 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
release/datafiles/userdef/userdef_default_theme.c
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),
},
},
};

34
release/scripts/presets/interface_theme/blender_light.xml
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>

2
release/scripts/startup/bl_ui/space_outliner.py
View File

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

3
source/blender/blenloader/intern/versioning_userdef.c
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