tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release' 

# Conflicts:
#	source/blender/blenkernel/BKE_blender_version.h
This commit is contained in:
Pablo Vazquez 2023-10-31 13:09:51 +01:00
parent 0dbc13529b 86ccbc4353
commit f9928a0f56
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/datafiles/userdef/userdef_default_theme.c
View File

@ -125,10 +125,10 @@ const bTheme U_theme_default = {
.roundness = 0.2f,
},
.wcol_pulldown = {
.outline = RGBA(0x3d3d3dff),
.inner = RGBA(0x22222266),
.inner_sel = RGBA(0x4772b3b3),
.item = RGBA(0x727272ff),
.outline = RGBA(0x3d3d3d00),
.inner = RGBA(0x22222200),
.inner_sel = RGBA(0xffffff1a),
.item = RGBA(0xffffff8f),
.text = RGBA(0xd9d9d9ff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,

4
source/blender/blenloader/intern/versioning_userdef.cc
View File

@ -129,6 +129,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_sequencer.transition);
}
if (!USER_VERSION_ATLEAST(400, 35)) {
memcpy(btheme, &U_theme_default, sizeof(*btheme));
}
/**
* Versioning code until next subversion bump goes here.
*