diff options
author | Julian Eisel <julian@blender.org> | 2021-01-13 02:52:10 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2021-01-13 13:10:17 +0300 |
commit | aed5b88ec1a651faad5f4a95828e1b9d907f0af4 (patch) | |
tree | bafe6858a775e4d359dec83be540b18307aec163 /release/scripts/startup | |
parent | 27b78c9c94baf6fa43268e851de58da96f7d7123 (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 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_ui/space_filebrowser.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 73a12e5d1c7..ef4f47c9399 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -197,7 +197,8 @@ class FILEBROWSER_PT_filter(Panel): sub = row.column(align=True) - sub.prop(params, "use_filter_asset_only") + if context.preferences.experimental.use_asset_browser: + sub.prop(params, "use_filter_asset_only") filter_id = params.filter_id for identifier in dir(filter_id): @@ -390,7 +391,8 @@ class FILEBROWSER_PT_advanced_filter(Panel): layout.separator() col = layout.column(align=True) - col.prop(params, "use_filter_asset_only") + if context.preferences.experimental.use_asset_browser: + col.prop(params, "use_filter_asset_only") filter_id = params.filter_id for identifier in dir(filter_id): diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 0b77d8a2538..22c0ce7f56b 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1342,6 +1342,11 @@ class USERPREF_PT_saveload_autorun(FilePathsPanel, Panel): class USERPREF_PT_file_paths_asset_libraries(FilePathsPanel, Panel): bl_label = "Asset Libraries" + @classmethod + def poll(cls, context): + prefs = context.preferences + return prefs.experimental.use_asset_browser + def draw(self, context): layout = self.layout layout.use_property_split = False @@ -2188,14 +2193,21 @@ class ExperimentalPanel: layout.use_property_split = False layout.use_property_decorate = False - for prop_keywords, task in items: + for prop_keywords, reference in items: split = layout.split(factor=0.66) col = split.split() col.prop(experimental, **prop_keywords) - if task: + if reference: + if type(reference) is tuple: + url_ext = reference[0] + text = reference[1] + else: + url_ext = reference + text = reference + col = split.split() - col.operator("wm.url_open", text=task, icon='URL').url = self.url_prefix + task + col.operator("wm.url_open", text=text, icon='URL').url = self.url_prefix + url_ext """ @@ -2225,6 +2237,7 @@ class USERPREF_PT_experimental_new_features(ExperimentalPanel, Panel): ({"property": "use_switch_object_operator"}, "T80402"), ({"property": "use_sculpt_tools_tilt"}, "T82877"), ({"property": "use_object_add_tool"}, "T57210"), + ({"property": "use_asset_browser"}, ("project/profile/124/", "Milestone 1")), ), ) |