diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-18 13:00:15 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-18 13:10:28 +0300 |
| commit | 66932a2c814037f897af56693efb68b6993406fb (patch) | |
| tree | 40bc8e050a857d0a26c0383094b8ad02d3eb6bdb | |
| parent | 76277e74023c0ab6926681c7bca4774fe2d130cb (diff) | |
Add-ons: disable 3ds add-on in all existing preferences.
Silences warning when running with --debug. If/when this add-on is ported,
users that need it can enable it again.
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 031e4deb1a8..cad733f774d 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -24,7 +24,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 280 -#define BLENDER_SUBVERSION 49 +#define BLENDER_SUBVERSION 50 /* 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_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 59697427d5d..973057fa362 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -80,11 +80,6 @@ void BLO_update_defaults_userpref_blend(void) MEM_freeN(addon->prop); addon->prop = NULL; } - - if (STREQ(addon->module, "io_scene_3ds")) { - BLI_remlink(&U.addons, addon); - MEM_freeN(addon); - } } /* Transform tweak with single click and drag. */ diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index e7b5c0e0bba..14d10bbf85e 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -476,6 +476,11 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) GP_PAINT_UNUSED_0); } + if (!USER_VERSION_ATLEAST(280, 50)) { + /* 3ds is no longer enabled by default and not ported yet. */ + BKE_addon_remove_safe(&userdef->addons, "io_scene_3ds"); + } + /** * Include next version bump. */ |