Blender Git Commits

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

Fix compile error of asset library test on Windows

The `filesystem::path::c_str()` function returns the path in the native
string format, which is `wchar` on Windows. Instead use the one that
does a conversion to `std::string` if needed.

Correct name of catalog-tree item child container alias

This used to be a set, now it's a map.

Avoid unnecessary allocations in unit test

Add tests for catalog tree

Removes the printing of the catalog tree. Also adds and tests a function
to get the full catalog path from a tree item.

Simplify catalog tree creation using std::map

By using std::map with the catalog-component name as key simplifies
creation quite a bit. Generally it seems like the most appropriate
container for storing children in the tree.

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

Initial tree structure to load catalogs into

See T90608 and the basic design in T90066.

This tree structure will be needed for adding the UI. It's unclear how
much of the catalog backend will change still. Some design questions
were raised that need further discussion.

Use `ghc::filesystem` as platform compatible replacement for `std::filesystem`

Previous commit merged the `temp-cpp-ghc-filesystem` branch into this, now we
can actually use this replacment. This way the branch can be compiled on macOS.

Merge branch 'temp-cpp-ghc-filesystem' into temp-asset-browser-catalogs

Dependencies: Drop-in replacement for std::filesystem (in extern/)

Introduces the ghc::filesystem library as a (leight weight, header
only) drop-in replacement for std::filesystem. The latter can't be
used on the minimum macOS version we support. Once that changes, we can
switch to using std::filesystem directly.

Part of T90379.

* Add ghc::filesystem to extern/ as platform compatible replacement for
std::filesystem.
* Add Windows specific code to avoid issues with including Windows.h.
* Add blender::bli::filesystem as alias for ghc::filesystem. That should make
the ghc -> std transition easier later on since we can just change this
alias. Also makes it easy to switch between the two at compile time.

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

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

Asset Catalogs: change default catalog definition file name

Change the default catalog definition file name from
"single_catalog_definition_file.cats.txt" to "blender_assets.cats.txt".

Cleanup: use same parameter name in declaration & definition

Asset Catalogs: clean up catalog paths before using them

Clean up paths by trimming whitespace and separators
`/path/to/something ` ? `path/to/something`.

Asset Catalogs: allow adding new catalogs

New catalogs can be added with `AssetCatalogService::create_catalog()`.
It only requires the catalog path, and convert that into a suitable
catalog ID itself. It is intended that artists won't have to bother with
assigning catalog IDs, and that editing those is more of an advanced
feature.

Adding a catalog will automatically save the catalog definition file to
disk.

Asset Catalogs: gracefully handle catalog IDs without path

Ignore lines in a catalog definition file when it only contains the
catalog ID, and not the catalog path.

Cleanup: asset catalogs, use doxygen comments

Use `/**` instead of `/*` for some function documentation comments.

No functional changes.

Asset Catalogs: pass root dir of asset library to AssetCatalogService

Pass the root directory of the asset library to the `AssetCatalogService`
constructor. This makes it possible for newly created catalogs to be saved
somewhere.

No functional changes.