Blender Git Commits

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

Asset Catalogs: move from string identifier to UUIDs

Move from a string `catalog_id` to a UUID. This avoids having to keep
the ID of the catalog in sync with its semantics (so renaming from X to
Y can keep the UUID the same).

Since UUIDs don't communicate any human-readable information, the
mapping from catalog UUID to its path (stored in the Catalog Definition
File, CDF) is critical for understanding which asset is stored in which
human-readable catalog. To make this less critical, and to allow manual
data reconstruction after a CDF is lost/corrupted, each catalog also has
a "simple name" that's stored along with the UUID. This is also stored
on each asset, next to the catalog UUID.

Asset Catalog tree test: add array boundary check

This makes it easier to figure out what's going on when the test isn't
updated for new test data in the file it reads.

No functional changes to Blender itself.

Cleanup: asset catalog test, add explanatory comment

No functional changes.

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

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

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

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

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