Blender Git Commits

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.

Cleanup, Asset Catalogs: turn default catalog filename into a constant

Instead of hard-coding a path somewhere in the source, store it in a named
string constant.

No functional changes.

Cleanup: Asset Catalogs, make path separator static class member

Make `AssetCatalogService::path_separator` a static class member. There is
no need to make such constants per-object.

This in itself isn't that interesting a change, but it will be relevant
for an upcoming new string constant.

No functional changes.

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

Cleanup: Assets, add asset catalog documentation comments

Cleanup: Assets, remove unused forward/namespace declarations

Cleanup: Asset Catalogs, make fields private and add `_` suffix.

Partially revert "Cleanup: Assets, move AssetLibrary struct to global namespace"

This reverts the namespace changes from commit
784b97e280c1ba479822d0fba6ebfce0b91595d4.

Cleanup: Assets, move AssetLibrary struct to global namespace

Move `blender::bke::AssetLibrary` to the global namespace, causing the
C `struct AssetLibrary` to refer to the same object as the corresponding C++
struct.

Also move `intern/asset_library.hh` to `BKE_asset_library.hh`,
mimicking `BKE_geometry_set.hh`.

This makes the C and C++ pointers compatible, cleans up the code a bit,
and aids in debugging.

No functional changes.

Cleanup: C++ to C comment style

No functional changes.

Fix pointer ownership issue in `AssetCatalogService::parse_catalog_file()`, and solve some feature envy by adding a few `AssetCatalogDefinitionFile` methods.

Filelist: load AssetLibrary (and thus catalogs)

Load `AssetLibrary` struct when refreshing the filelist. This primarily
loads the asset catalog definition files.

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