Blender Git Commits

Merge branch 'master' into temp-asset-browser-catalogs

Only show icon to add catalogs for active catalog tree item

Fix crash reading files with an active catalog set

Merge remote-tracking branch 'origin/master' into temp-asset-browser-catalogs

Get basic catalog activation and catalog based filtering to work

It's now possible to activate a catalog in the catalog tree to only make
matching catalogs visible. This doesn't yet show assets from all
sub-catalogs when selecting a parent catalog.

Disable asset category checking in script, avoids warning

For now just always show category specific panels in the Asset Browser,
until we have a proper heuristic implemented for deciding when to show
them, based on catalogs.

Support active item in the tree view

Tree view items can now be activated, there is only ever one active
item.

Exact behavior for collapsing vs. activating on click may need some
experimentation. For now I've implemented something that makes sense for
asset catalogs (I think :) ).

Cleanup: Use iterator rather than recursive functions

Also add missing `_` suffix for protected member variable.

Support opening and collapsing tree-view items

For this to work, we need to support tree-view items with state that is
persistent over redraws. This is achieved by matching tree items to tree
items of a previous redraw, and copying the state if needed. This is
done in the tree-view API, so except for more advanced cases (with
custom item state or custom ways to match items), API users shouldn't
have to deal with this.

Merge branch 'master' into temp-asset-browser-catalogs-ui

Fix failure in asset catalog tests

Merge branch 'temp-asset-browser-catalogs' into temp-asset-browser-catalogs-ui

Merge branch 'master' into temp-asset-browser-catalogs

Attempt to fix build error on macOS buildbot

Couldn't recreate this on my macOS machine even though it uses the same minimum
deployment target version of 10.13.

Merge branch 'temp-asset-browser-catalogs' into temp-asset-browser-catalogs-ui

Merge branch 'master' into temp-asset-browser-catalogs

Merge branch 'master' into temp-asset-browser-catalogs-ui

Store tree-views in uiBlocks, preparing for persistent state

We need to be able to store persistent state in tree-views, e.g. which
items are collapsed. First step for that is storing the tree-views
somewhere where we can relate them to earlier versions of themselves.
The uiBlock should be a decent place for that.

Remove margin around tree-view items

Merge branch 'temp-asset-browser-catalogs' into temp-asset-browser-catalogs-ui