Page MenuHome
Differential D12955

Asset Browser: Allow specific ID types to be enabled by default
ClosedPublic
Actions

Authored by Julian Eisel (Severin) on Oct 21 2021, 4:31 PM.

Details

Reviewers
Sybren A. Stüvel (sybren)
Group Reviewers
Asset Browser
Maniphest Tasks
T91752: Enable material and world support by default, disable the rest
Commits
rBa28614879986: Assets: Allow specific data-block types to be enabled by default
Summary

Updates UI code so that we can enable the asset UI for specific ID types by default, i.e. irrespective of the "Extended Asset Browser" experimental feature.
Mark as Asset and Clear Asset are always visible in the Outliner context menu now, but are grayed out if not applicable and show a disabled hint in the tooltip.

Also enables Materials and World assets by default. More for testing, should be committed separately.

Open Issue:
With this it will be possible to mark regular actions as assets, even if they were not created as poses. Should we deal with that differently?

Diff Detail

Repository
rB Blender
Branch
temp-asset-browser-non-experimental-ids (branched from master)
Build Status
Buildable 18079
Build 18079: arc lint + arc unit

Event Timeline

Julian Eisel (Severin) requested review of this revision.Oct 21 2021, 4:31 PM
Julian Eisel (Severin) created this revision.
Harbormaster completed remote builds in B18079: Diff 43698.Oct 21 2021, 4:31 PM
Julian Eisel (Severin) added inline comments.Oct 21 2021, 4:35 PM
source/blender/editors/interface/interface_region_tooltip.c
963–966

This is a fix needed for tooltips to get the correct context from the button they are for. To be committed separately.

Julian Eisel (Severin) updated this revision to Diff 43699.Oct 21 2021, 4:40 PM
  • Merge branch 'master' into temp-asset-browser-non-experimental-ids
Harbormaster completed remote builds in B18080: Diff 43699.Oct 21 2021, 4:40 PM
Julian Eisel (Severin) added a project: Asset Browser.Oct 21 2021, 4:41 PM
Julian Eisel (Severin) added inline comments.
source/blender/editors/interface/interface_region_tooltip.c
963–966

Done with rB594c857f652b.

Julian Eisel (Severin) added a task: T91752: Enable material and world support by default, disable the rest.Oct 21 2021, 4:43 PM
Julian Eisel (Severin) updated this revision to Diff 43702.Oct 21 2021, 4:58 PM
  • Move alle experimental flag logic to ED
Harbormaster completed remote builds in B18083: Diff 43702.Oct 21 2021, 4:58 PM
Julian Eisel (Severin) added inline comments.Oct 21 2021, 5:00 PM
release/scripts/startup/bl_ui/space_outliner.py
316–318

Just always show the mark/clear context menu entries in the Outliner now. We could make it "smarter" and only show it when supported assets are selected. Then we'd have to move the menu back to C though, and I think having a disabled button with a disabled hint is nice.

Julian Eisel (Severin) updated this revision to Diff 43703.Oct 21 2021, 5:02 PM
  • Correct comment
Harbormaster completed remote builds in B18084: Diff 43703.Oct 21 2021, 5:02 PM
Sybren A. Stüvel (sybren) accepted this revision.Oct 21 2021, 7:27 PM
Sybren A. Stüvel (sybren) added a subscriber: Sybren A. Stüvel (sybren).

LGTM, just some small pokes. Can be committed when those have been addressed.

release/scripts/startup/bl_ui/space_outliner.py
316–318

+1 on disabled + hint

source/blender/editors/asset/ED_asset_type.h
50 ↗(On Diff #43703)

Oxford comma: , or

50 ↗(On Diff #43703)

Add a note that this should start with a consonant, as it'll be prefixed with "a " in asset_operation_unsupported_type_msg

source/blender/editors/asset/intern/asset_ops.cc
74–84

Document what this is. The design is nice, but when reading the file from top to bottom this'll be a mystery.

source/blender/editors/asset/intern/asset_type.cc
31–32 ↗(On Diff #43703)

👍 👍

This revision is now accepted and ready to land.Oct 21 2021, 7:27 PM
Closed by commit rBa28614879986: Assets: Allow specific data-block types to be enabled by default (authored by Julian Eisel (Severin)). · Explain WhyOct 21 2021, 10:20 PM
This revision was automatically updated to reflect the committed changes.
Julian Eisel (Severin) marked 5 inline comments as done.
Julian Eisel (Severin) added a commit: rBa28614879986: Assets: Allow specific data-block types to be enabled by default.

Revision Contents
Changeset List

PathSize
release/
scripts/
startup/
bl_ui/
3 lines
4 lines
source/
blender/
blenkernel/
9 lines
intern/
10 lines
editors/
asset/
13 lines
intern/
30 lines
96 lines
interface/
2 lines
5 lines
space_file/
3 lines

Diff 43698

View Options

release/scripts/startup/bl_ui/space_filebrowser.py

Loading...
View Options

release/scripts/startup/bl_ui/space_outliner.py

Loading...
View Options

source/blender/blenkernel/BKE_asset.h

Loading...
View Options

source/blender/blenkernel/intern/asset.cc

Loading...
View Options

source/blender/editors/asset/ED_asset_mark_clear.h

Loading...
View Options

source/blender/editors/asset/intern/asset_mark_clear.cc

Loading...
View Options

source/blender/editors/asset/intern/asset_ops.cc

Loading...
View Options

source/blender/editors/interface/interface_context_menu.c

Loading...
View Options

source/blender/editors/interface/interface_region_tooltip.c

Loading...
View Options

source/blender/editors/space_file/space_file.c

Loading...