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-10-12 12:28:16 +0300
committerSybren A. Stüvel <sybren@blender.org>2021-10-12 12:28:16 +0300
commitad1735f8ede966b7d49423928ad05cca25119949 (patch)
tree27c351114b6f66ef50418445fb35e16c9edbf6e1 /source/blender/editors/asset
parentac657bee0142f96fcd3fa5d56455658834a19b19 (diff)
Asset Catalogs: recursive deletion of catalogs & children
Recursively delete asset catalogs with `AssetCatalogService:prune_...` functions. This deletes the catalog and all of its children. The old `delete_catalog` function has been renamed to `delete_catalog_by_id()`, and is now a lower-level function (no deletion of children, no rebuilding of the tree). The `prune_catalogs_by_path()` and `prune_catalogs_by_id()` do delete children and do rebuild the catalog tree. Manifest task: T91634
Diffstat (limited to 'source/blender/editors/asset')
-rw-r--r--source/blender/editors/asset/intern/asset_catalog.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/asset/intern/asset_catalog.cc b/source/blender/editors/asset/intern/asset_catalog.cc
index 6e49ca2dd5c..eb1865ee9cc 100644
--- a/source/blender/editors/asset/intern/asset_catalog.cc
+++ b/source/blender/editors/asset/intern/asset_catalog.cc
@@ -77,5 +77,5 @@ void ED_asset_catalog_remove(::AssetLibrary *library, const CatalogID &catalog_i
return;
}
- catalog_service->delete_catalog(catalog_id);
+ catalog_service->prune_catalogs_by_id(catalog_id);
}