Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T72340: Version bump for recent Userdef changes

Browse Source 
Updates blender subversion in order to properly handle recent userdef theme changes.

Differential Revision: https://developer.blender.org/D6388

Reviewed by Campbell Barton
This commit is contained in:
Harley Acheson
2019-12-10 16:30:30 -08:00
parent 63d521432e
commit d1631c9f03
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -27,7 +27,7 @@
* \note Use #STRINGIFY() rather than defining with quotes. * \note Use #STRINGIFY() rather than defining with quotes.
*/ */
#define BLENDER_VERSION 282 #define BLENDER_VERSION 282
#define BLENDER_SUBVERSION 4 #define BLENDER_SUBVERSION 5
/** Several breakages with 280, e.g. collections vs layers. */ /** Several breakages with 280, e.g. collections vs layers. */
#define BLENDER_MINVERSION 280 #define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0 #define BLENDER_MINSUBVERSION 0

11
source/blender/blenloader/intern/versioning_userdef.c
View File

@@ -156,10 +156,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
copy_v4_v4_uchar(btheme->space_nla.nla_track, btheme->space_nla.header); copy_v4_v4_uchar(btheme->space_nla.nla_track, btheme->space_nla.header);
} }
/** if (!USER_VERSION_ATLEAST(282, 5)) {
* Include next version bump.
*/
{
FROM_DEFAULT_V4_UCHAR(space_sequencer.anim_preview_range); FROM_DEFAULT_V4_UCHAR(space_sequencer.anim_preview_range);
FROM_DEFAULT_V4_UCHAR(space_text.line_numbers); FROM_DEFAULT_V4_UCHAR(space_text.line_numbers);
FROM_DEFAULT_V4_UCHAR(tui.widget_text_cursor); FROM_DEFAULT_V4_UCHAR(tui.widget_text_cursor);
@@ -167,6 +164,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme)
FROM_DEFAULT_V4_UCHAR(space_view3d.face_front); FROM_DEFAULT_V4_UCHAR(space_view3d.face_front);
} }
/* Versioning code until next subversion bump goes here.
* Note: be sure to check "versioning_{BLENDER_VERSION}.c" when bumping the version.
* Note: keep this message at the bottom of the function. */
{
}
#undef FROM_DEFAULT_V4_UCHAR #undef FROM_DEFAULT_V4_UCHAR
#undef USER_VERSION_ATLEAST #undef USER_VERSION_ATLEAST