griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v5.0-release'

Browse Source 
# Conflicts:
#	source/blender/blenkernel/BKE_blender_version.h
#	source/blender/blenloader/intern/versioning_userdef.cc
This commit is contained in:
Pablo Vazquez
2025-10-17 18:53:10 +02:00
parent a003b27244 829c6a7b98
commit 4340d5fff9
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -390,6 +390,26 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(common.anim.scene_strip_range);
}
/* Reset the theme due to compatibility breaking changes in 5.0. */
if (!USER_VERSION_ATLEAST(500, 111)) {
MEMCPY_STRUCT_AFTER(btheme, &U_theme_default, name);
/* Update text styles to match. */
LISTBASE_FOREACH (uiStyle *, style, &userdef->uistyles) {
style->paneltitle.points = 11.0f;
style->paneltitle.shadow = 3;
style->paneltitle.shadowalpha = 0.5f;
style->paneltitle.shadowcolor = 0.0f;
style->widget.points = 11.0f;
style->widget.shadow = 1;
style->widget.shadowalpha = 0.5f;
style->widget.shadowcolor = 0.0f;
style->tooltip.shadow = 1;
style->tooltip.points = 11.0f;
style->tooltip.shadowalpha = 0.5f;
style->tooltip.shadowcolor = 0.0f;
}
}
if (!USER_VERSION_ATLEAST(501, 3)) {
FROM_DEFAULT_V4_UCHAR(space_action.anim_interpolation_other);
FROM_DEFAULT_V4_UCHAR(space_action.anim_interpolation_constant);