diff options
author | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-20 23:34:39 +0300 |
---|---|---|
committer | Nathan Craddock <nzcraddock@gmail.com> | 2019-08-21 00:59:22 +0300 |
commit | 2db09212fc7fb2506e7c582aedf08f94e3fff8d7 (patch) | |
tree | 5e3fefe075b5d6487de3607f6867c9edbfce1c2e | |
parent | f39145b21108c1a4234ef13df8a39bdefe02c902 (diff) |
Fix T68869: outliner missing subversion bump
The recent commit of synced selection added an active color theme to
the outliner, and synced selection enabled by default. The subversion
bump was missed.
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 7 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 7 |
3 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 0c55ae8ee83..09900651dad 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 2 +#define BLENDER_SUBVERSION 3 /** 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_280.c b/source/blender/blenloader/intern/versioning_280.c index 149b02e7761..d2017864192 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3662,8 +3662,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - { - /* Versioning code until next subversion bump goes here. */ + if (!MAIN_VERSION_ATLEAST(bmain, 281, 3)) { if (U.view_rotate_sensitivity_turntable == 0) { U.view_rotate_sensitivity_turntable = DEG2RADF(0.4f); U.view_rotate_sensitivity_trackball = 1.0f; @@ -3693,4 +3692,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + { + /* Versioning code until next subversion bump goes here. */ + } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 1284f2dcddc..8bbfc29131e 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -141,12 +141,15 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_outliner.row_alternate); } + if (!USER_VERSION_ATLEAST(281, 3)) { + FROM_DEFAULT_V4_UCHAR(space_outliner.selected_highlight); + FROM_DEFAULT_V4_UCHAR(space_outliner.active); + } + /** * Include next version bump. */ { - FROM_DEFAULT_V4_UCHAR(space_outliner.selected_highlight); - FROM_DEFAULT_V4_UCHAR(space_outliner.active); } #undef FROM_DEFAULT_V4_UCHAR |