Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2021-01-21 16:37:19 +0300
committerJulian Eisel <julian@blender.org>2021-01-21 16:40:13 +0300
commit1135790ad53421acf4265d0467f122072ba1d858 (patch)
tree7647d9f95ed059a5088bc7a3567c1c5204c80049
parentf4d07196bd6e7e9a5f27d103bcbae564c6ac55b9 (diff)
Asset Browser: Enable by default in alpha builds
The Asset Browser is still considered an experimental feature right now. But it can be enabled by default for alpha builds, to get further testing and feedback. It will hopefully be a non-experimental feature by the end of bcon1. This is done in agreement with Dalai.
-rw-r--r--source/blender/blenkernel/BKE_blender_version.h2
-rw-r--r--source/blender/blenkernel/intern/blendfile.c4
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c7
3 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 8752fd9c8cd..e64cb1b0452 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 1
+#define BLENDER_FILE_SUBVERSION 2
/* 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/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 0855db1a943..49475c014cd 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -647,6 +647,10 @@ UserDef *BKE_blendfile_userdef_from_defaults(void)
BKE_studiolight_default(userdef->light_param, userdef->light_ambient);
BKE_preferences_asset_library_default_add(userdef);
+ /* Enable asset browser features by default for alpha testing.
+ * BLO_sanitize_experimental_features_userpref_blend() will disable it again for non-alpha
+ * builds. */
+ userdef->experimental.use_asset_browser = true;
return userdef;
}
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index 0bc1cc4a05c..9af2dee296b 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -826,6 +826,13 @@ void blo_do_versions_userdef(UserDef *userdef)
}
}
+ if (!USER_VERSION_ATLEAST(293, 2)) {
+ /* Enable asset browser features by default for alpha testing.
+ * BLO_sanitize_experimental_features_userpref_blend() will disable it again for non-alpha
+ * builds. */
+ userdef->experimental.use_asset_browser = true;
+ }
+
/**
* Versioning code until next subversion bump goes here.
*