diff options
| author | Harley Acheson <harley.acheson@gmail.com> | 2019-12-11 03:30:30 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2019-12-11 03:31:37 +0300 |
| commit | d1631c9f03ea0d198cf7539d4af803c78caa656b (patch) | |
| tree | 9e1ac204dd5d145fc5998ca3820d50d3b31030c4 /source/blender | |
| parent | 63d521432e9307643c279237b041a8f2ac6dda9d (diff) | |
Fix T72340: Version bump for recent Userdef changes
Updates blender subversion in order to properly handle recent userdef theme changes.
Differential Revision: https://developer.blender.org/D6388
Reviewed by Campbell Barton
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index a26b76e7069..dfccd0732ee 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -27,7 +27,7 @@ * \note Use #STRINGIFY() rather than defining with quotes. */ #define BLENDER_VERSION 282 -#define BLENDER_SUBVERSION 4 +#define BLENDER_SUBVERSION 5 /** Several breakages with 280, e.g. collections vs layers. */ #define BLENDER_MINVERSION 280 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index d097ed630b0..a453cf8fa74 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -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); } - /** - * Include next version bump. - */ - { + if (!USER_VERSION_ATLEAST(282, 5)) { FROM_DEFAULT_V4_UCHAR(space_sequencer.anim_preview_range); FROM_DEFAULT_V4_UCHAR(space_text.line_numbers); 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); } + /* 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 USER_VERSION_ATLEAST |