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.
This commit is contained in:
2019-08-20 14:34:39 -06:00
parent f39145b211
commit 2db09212fc
3 changed files with 11 additions and 5 deletions

View File

@@ -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

View File

@@ -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. */
}
}

View File

@@ -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