diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-05 11:27:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-05 23:51:59 +0300 |
| commit | 0905af68ecd446210b5938a1374245fe3555aecd (patch) | |
| tree | 806da4cc40e3cdb3504dfd24d6e9374ce77832a3 /source | |
| parent | a498a5494c144562cb88c459ddfc2fddb2a925ca (diff) | |
Fix T70539: file folder color preference not saved
Please always bump the subversion for cases like this.
Diffstat (limited to 'source')
| -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 7b879cc1a15..5d838917f86 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 281 -#define BLENDER_SUBVERSION 13 +#define BLENDER_SUBVERSION 14 /** 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 3eaf45954f3..d2192f1e22a 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -147,10 +147,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_outliner.active); } - /** - * Include next version bump. - */ - { + if (!USER_VERSION_ATLEAST(281, 14)) { FROM_DEFAULT_V4_UCHAR(space_file.execution_buts); FROM_DEFAULT_V4_UCHAR(tui.icon_folder); FROM_DEFAULT_V4_UCHAR(space_clip.path_keyframe_before); @@ -158,6 +155,12 @@ 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. + */ + { + } + #undef FROM_DEFAULT_V4_UCHAR #undef USER_VERSION_ATLEAST |