diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 89f83c44c11..21ef70b7bcd 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 11 +#define BLENDER_SUBVERSION 12 /** 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 75b87c4f1f0..71077d5a89d 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -615,13 +615,16 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) BKE_addon_remove_safe(&userdef->addons, "io_scene_x3d"); } + if (!USER_VERSION_ATLEAST(281, 12)) { + userdef->render_display_type = USER_RENDER_DISPLAY_WINDOW; + userdef->filebrowser_display_type = USER_TEMP_SPACE_DISPLAY_WINDOW; + } + /** * Include next version bump. */ { /* pass */ - userdef->render_display_type = USER_RENDER_DISPLAY_WINDOW; - userdef->filebrowser_display_type = USER_TEMP_SPACE_DISPLAY_WINDOW; } if (userdef->pixelsize == 0.0f) { |