Merge branch 'blender-v4.0-release'
# Conflicts: # source/blender/blenkernel/BKE_blender_version.h
This commit is contained in:
commit
f9928a0f56
|
@ -125,10 +125,10 @@ const bTheme U_theme_default = {
|
||||||
.roundness = 0.2f,
|
.roundness = 0.2f,
|
||||||
},
|
},
|
||||||
.wcol_pulldown = {
|
.wcol_pulldown = {
|
||||||
.outline = RGBA(0x3d3d3dff),
|
.outline = RGBA(0x3d3d3d00),
|
||||||
.inner = RGBA(0x22222266),
|
.inner = RGBA(0x22222200),
|
||||||
.inner_sel = RGBA(0x4772b3b3),
|
.inner_sel = RGBA(0xffffff1a),
|
||||||
.item = RGBA(0x727272ff),
|
.item = RGBA(0xffffff8f),
|
||||||
.text = RGBA(0xd9d9d9ff),
|
.text = RGBA(0xd9d9d9ff),
|
||||||
.text_sel = RGBA(0xffffffff),
|
.text_sel = RGBA(0xffffffff),
|
||||||
.roundness = 0.2f,
|
.roundness = 0.2f,
|
||||||
|
|
|
@ -129,6 +129,10 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
|
||||||
FROM_DEFAULT_V4_UCHAR(space_sequencer.transition);
|
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.
|
* Versioning code until next subversion bump goes here.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue