Commit: 3ed7aeef035df4de2042c2904e281fd3dc9fd09c Author: Julian Eisel Date: Thu Oct 8 14:45:23 2020 +0200 Branches: asset-browser https://developer.blender.org/rB3ed7aeef035df4de2042c2904e281fd3dc9fd09c
Fix default asset repository not being added =================================================================== M source/blender/blenkernel/BKE_blender_version.h M source/blender/blenloader/intern/versioning_userdef.c =================================================================== diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index aed4dad05ad..bd10deb216b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,7 +39,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 8 +#define BLENDER_FILE_SUBVERSION 7 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c index e36b6f04b69..a204d0cf166 100644 --- a/source/blender/blenloader/intern/versioning_userdef.c +++ b/source/blender/blenloader/intern/versioning_userdef.c @@ -799,10 +799,6 @@ void blo_do_versions_userdef(UserDef *userdef) } } - if (!USER_VERSION_ATLEAST(291, 6)) { - BKE_preferences_asset_repository_default_add(userdef); - } - /** * Versioning code until next subversion bump goes here. * @@ -814,6 +810,9 @@ void blo_do_versions_userdef(UserDef *userdef) */ { /* Keep this block, even when empty. */ + if (BLI_listbase_is_empty(&userdef->asset_repositories)) { + BKE_preferences_asset_repository_default_add(userdef); + } } if (userdef->pixelsize == 0.0f) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs