From 55245ed6ad72d78a58d6bb8b07f60177450d948c Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 9 Sep 2019 17:41:38 +0200 Subject: [PATCH] Fix (unreported) non-official X3D add-on enabled in factory startup. Forgot to remove it from there when I moved it to community-supported status last week. Also raising subversion. --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenloader/intern/versioning_280.c | 7 +++++-- source/blender/blenloader/intern/versioning_userdef.c | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index e68989dd9ef..24a48b2913b 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 8 +#define BLENDER_SUBVERSION 9 /** 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 3bccf65f4e7..d06da062d49 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3766,8 +3766,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, 9)) { for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) { for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) { for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { @@ -3842,4 +3841,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 67b8ce1d0de..0182f8f6162 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -610,6 +610,11 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) userdef->drag_threshold_tablet = 10; } + if (!USER_VERSION_ATLEAST(281, 9)) { + /* X3D is no longer enabled by default. */ + BKE_addon_remove_safe(&userdef->addons, "io_scene_x3d"); + } + /** * Include next version bump. */