Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2021-09-30 17:34:30 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-09-30 17:34:30 +0300
commit42ce88f15cb77c859c6b2fed119934836235b961 (patch)
tree70e172eec5c348356060fecfd179a11ed54860f0 /source/blender/editors/asset
parent628fab696cfaefdd2ac758849c8a1e9a3a0beef0 (diff)
Cleanup: remove `CatalogPath` alias
The `CatalogPath` name was an alias for `std::string`, so that it could be easily switched over to something else. This happened in the previous commit (switched to `AssetCatalogPath`), so the alias is no longer necessary. This commit removes the `CatalogPath` alias. No functional changes.
Diffstat (limited to 'source/blender/editors/asset')
-rw-r--r--source/blender/editors/asset/intern/asset_catalog.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/asset/intern/asset_catalog.cc b/source/blender/editors/asset/intern/asset_catalog.cc
index c3e5a888796..6e49ca2dd5c 100644
--- a/source/blender/editors/asset/intern/asset_catalog.cc
+++ b/source/blender/editors/asset/intern/asset_catalog.cc
@@ -37,7 +37,7 @@ struct CatalogUniqueNameFnData {
static bool catalog_name_exists_fn(void *arg, const char *name)
{
CatalogUniqueNameFnData &fn_data = *static_cast<CatalogUniqueNameFnData *>(arg);
- CatalogPath fullpath = CatalogPath(fn_data.parent_path) / name;
+ AssetCatalogPath fullpath = AssetCatalogPath(fn_data.parent_path) / name;
return fn_data.catalog_service.find_catalog_by_path(fullpath);
}
@@ -64,7 +64,7 @@ AssetCatalog *ED_asset_catalog_add(::AssetLibrary *library,
}
std::string unique_name = catalog_name_ensure_unique(*catalog_service, name, parent_path);
- CatalogPath fullpath = CatalogPath(parent_path) / unique_name;
+ AssetCatalogPath fullpath = AssetCatalogPath(parent_path) / unique_name;
return catalog_service->create_catalog(fullpath);
}