blender
/
blender
137
417
Fork 599
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Asset Shelf (Experimental Feature) #104831

Closed
Julian Eisel wants to merge 399 commits from asset-shelf into main
pull from: asset-shelf
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 30 Commits 399 Files Changed - -7
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 55f0e16999 - Show all commits

2
source/blender/asset_system/AS_asset_catalog_tree.hh
View File

@ -66,8 +66,6 @@ class AssetCatalogTreeItem {
/** Iterate over children calling \a callback for each of them, but do not recurse into their
* children. */
void foreach_child(ItemIterFn callback);
/** Recursively iterate over the subtree of each child, calling \a callback for each item. */
void foreach_item(ItemIterFn callback);
private:
static void foreach_item_recursive(ChildMap &children_, ItemIterFn callback);

5
source/blender/asset_system/intern/asset_catalog_tree.cc
View File

@ -76,11 +76,6 @@ void AssetCatalogTreeItem::foreach_child(const ItemIterFn callback)
}
}
void AssetCatalogTreeItem::foreach_item(ItemIterFn callback)
{
foreach_item_recursive(children_, callback);
}
/* ---------------------------------------------------------------------- */
void AssetCatalogTree::insert_item(const AssetCatalog &catalog)