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-13 02:52:10 +0300
committerJulian Eisel <julian@blender.org>2021-01-13 13:10:17 +0300
commitaed5b88ec1a651faad5f4a95828e1b9d907f0af4 (patch)
treebafe6858a775e4d359dec83be540b18307aec163 /source/blender/editors/space_file
parent27b78c9c94baf6fa43268e851de58da96f7d7123 (diff)
Asset System: Disable Asset Browser as experimental feature
The Asset Browser will be disabled and not available for the 2.92 release. In alpha/beta builds, there will be an "Asset Browser" option under Preferences > Experimental, if the developer extras are enabled. Note that this also disables related UI elements (e.g. "Mark Asset" buttons, Preferences settings for asset libraries, etc.). The code is still in master of course, development and testing will continue there. But there simply needs to be too much polishing and fixing before the 2.92 release, plus there are some design decisions to be reevaluated. Check the milestone 1 project to follow ongoing work: https://developer.blender.org/project/view/124/
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/space_file.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 774dc54700c..aedc6228355 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -776,7 +776,13 @@ static void file_space_subtype_item_extend(bContext *UNUSED(C),
EnumPropertyItem **item,
int *totitem)
{
- RNA_enum_items_add(item, totitem, rna_enum_space_file_browse_mode_items);
+ if (U.experimental.use_asset_browser) {
+ RNA_enum_items_add(item, totitem, rna_enum_space_file_browse_mode_items);
+ }
+ else {
+ RNA_enum_items_add_value(
+ item, totitem, rna_enum_space_file_browse_mode_items, FILE_BROWSE_MODE_FILES);
+ }
}
static const char *file_context_dir[] = {"active_file", "active_id", NULL};