diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-25 01:46:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-25 01:59:25 +0300 |
| commit | f48a089db850db7f5020911599c59751bc93fcef (patch) | |
| tree | 7cc7ec62499631b288162694119be341fdfa596b | |
| parent | a2e209f20a44d14c1c56ba9f69b6589c318c7199 (diff) | |
Addons: enable GLTF 2.0 addon by default.
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_userdef.c | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 6f0128c332290c6f3639d4d949d3e06bfaa7102 +Subproject acd39fc1b03e1f4a2d0b670189cde18db50a52e diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 781dd3f9826..32b9508a679 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -28,7 +28,7 @@ * and keep comment above the defines. * Use STRINGIFY() rather than defining with quotes */ #define BLENDER_VERSION 280 -#define BLENDER_SUBVERSION 32 +#define BLENDER_SUBVERSION 33 /* 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 d0e791fc1d6..2cf00bfe2c1 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2253,7 +2253,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } } - { + if (!MAIN_VERSION_ATLEAST(bmain, 280, 33)) { /* Grease pencil reset sculpt brushes after struct rename */ if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "weighttype")) { float curcolor_add[3], curcolor_sub[3]; @@ -2428,4 +2428,7 @@ 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 5279ed19343..729b668c4ec 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -406,6 +406,11 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef) } } + if (!USER_VERSION_ATLEAST(280, 33)) { + /* Enable GLTF addon by default. */ + BKE_addon_ensure(&userdef->addons, "io_scene_gltf2"); + } + /** * Include next version bump. */ |