diff options
Diffstat (limited to 'source/blender/blenloader/intern/versioning_userdef.c')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 3cc2372a2b0..36abbaf62cf 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -225,17 +225,7 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_image.grid); } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - #BLO_version_defaults_userpref_blend in this file. - * - "versioning_{BLENDER_VERSION}.c" - * - * \note Keep this message at the bottom of the function. - */ - { - /* Keep this block, even when empty. */ + if (!USER_VERSION_ATLEAST(291, 3)) { for (int i = 0; i < COLLECTION_COLOR_TOT; ++i) { FROM_DEFAULT_V4_UCHAR(collection_color[i].color); } @@ -250,6 +240,19 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) copy_v3_v3_uchar(btheme->space_node.grid, btheme->space_node.back); } + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - #BLO_version_defaults_userpref_blend in this file. + * - "versioning_{BLENDER_VERSION}.c" + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } + #undef FROM_DEFAULT_V4_UCHAR #undef USER_VERSION_ATLEAST |