Blender Git Commits

Merge branch 'master' into asset-metadata

Merge branch 'asset-metadata' into asset-browser

Smaller UI tweaks for repository selection

* Rename "Local" to "Current File"
* Better separate built-in and custom repositories. Use columns with
headings "Custom" and "Built-in".
* Add separator before repository selector.

Support switching between custom repositories in the Asset Browser

Now the repository list in Asset Browers includes the custom
repositories. They can be selected and should load fine (making the
Browser show assets stored in the repository's .blend file).
Some sanity checks (e.g. test if the repository path is valid and points
to a .blend file) could be added still.

Add Preferences options to set up custom asset repositories

Can be found under the File Paths category. There already is a default
repository, called "Default" and pointing to the documents or home
directory. For most Linux users it will be ~/assets.blend, for Windows
users it will be the Documents directory.

Note that this is only the Preference part of this. The Asset-Browser
doesn't use this yet.

For now, asset repositories will be single .blend files. There are some
design questions regarding how the Asset Browser would display a
directory structure as repository.

Support showing local assets in Asset Browsers ("Local" repository)

Adds a new repository "Local" (will probably rename this in a bit, together
with other UI improvements).

The asset browser shows the assets in the current Blender session then. Note
that there's a difference between the data saved in the file, and the current
session's data - the file may have unsaved changes.
So this new repository acts on the current runtime "main" data, not on a file
stored on disk.

Note that the Asset Browser still has to refreshed or reopened when
creating/deleting assets, so that the changes are reflected.

Merge branch 'master' into asset-metadata

Merge branch 'asset-metadata' into asset-browser

Fix mistake in previous commit

The "Make Asset" button in context menus wouldn't actually do anything.

Merge branch 'asset-metadata' into asset-browser

Show "Make Asset" in the context menu of buttons showing IDs

Merge branch 'asset-metadata' into asset-browser

Fix build error after latest merge

Merge branch 'master' into asset-metadata

Merge branch 'asset-metadata' into asset-browser

Merge branch 'master' into asset-metadata

Fix warning when compiling and incorrect behavior after last merge

Merge branch 'asset-metadata' into asset-browser

Fix compile error after last merge

Merge branch 'asset-metadata' into asset-browser