diff options
author | Julian Eisel <julian@blender.org> | 2020-03-23 18:43:54 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-23 18:43:54 +0300 |
commit | 24b27ea231154ce0d0b67402aeee00f63ab41f63 (patch) | |
tree | b9f730ca9ec91711be783786026ed6fa633525cc | |
parent | c95b522856c590e31278548ec02bbac1a64e217d (diff) |
Bump subversion for previous theme additions
-rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 28 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 9 |
3 files changed, 22 insertions, 17 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 18fd804c8c4..78e0e12355b 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 283 -#define BLENDER_SUBVERSION 10 +#define BLENDER_SUBVERSION 11 /** 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 4d472401521..a7c9c073018 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -4825,19 +4825,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - /** - * Versioning code until next subversion bump goes here. - * - * \note Be sure to check when bumping the version: - * - #do_versions_after_linking_280 in this file. - * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend - * - "versioning_userdef.c", #do_versions_theme - * - * \note Keep this message at the bottom of the function. - */ - { - /* Keep this block, even when empty. */ - + if (!MAIN_VERSION_ATLEAST(bmain, 283, 11)) { if (!DNA_struct_elem_find(fd->filesdna, "OceanModifierData", "float", "fetch_jonswap")) { for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) { for (ModifierData *md = object->modifiers.first; md; md = md->next) { @@ -4865,4 +4853,18 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } } + + /** + * Versioning code until next subversion bump goes here. + * + * \note Be sure to check when bumping the version: + * - #do_versions_after_linking_280 in this file. + * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend + * - "versioning_userdef.c", #do_versions_theme + * + * \note Keep this message at the bottom of the function. + */ + { + /* Keep this block, even when empty. */ + } } diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index 2d2641aca8b..a88e4e20d68 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -205,6 +205,12 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) FROM_DEFAULT_V4_UCHAR(space_sequencer.mask); } + if (!USER_VERSION_ATLEAST(283, 11)) { + FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_primary); + FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_secondary); + btheme->tui.transparent_checker_size = U_theme_default.tui.transparent_checker_size; + } + /** * Versioning code until next subversion bump goes here. * @@ -216,9 +222,6 @@ static void do_versions_theme(const UserDef *userdef, bTheme *btheme) */ { /* Keep this block, even when empty. */ - FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_primary); - FROM_DEFAULT_V4_UCHAR(tui.transparent_checker_secondary); - btheme->tui.transparent_checker_size = U_theme_default.tui.transparent_checker_size; } #undef FROM_DEFAULT_V4_UCHAR |