[Bf-blender-cvs] [4bc63373875] temp-asset-browser-catalogs-ui: Adapt to changes in master

[Julian Eisel]

Commit: 4bc63373875ea8ded5c7c3430908a06b4e63177a
Author: Julian Eisel
Date:   Mon Sep 27 17:54:25 2021 +0200
Branches: temp-asset-browser-catalogs-ui
https://developer.blender.org/rB4bc63373875ea8ded5c7c3430908a06b4e63177a

Adapt to changes in master

===================================================================

M	source/blender/editors/asset/intern/asset_catalog.cc
M	source/blender/editors/space_file/asset_catalog_tree_view.cc

===================================================================

diff --git a/source/blender/editors/asset/intern/asset_catalog.cc b/source/blender/editors/asset/intern/asset_catalog.cc
index e4c73564946..0c1fef9f983 100644
--- a/source/blender/editors/asset/intern/asset_catalog.cc
+++ b/source/blender/editors/asset/intern/asset_catalog.cc
@@ -44,7 +44,7 @@ static bool catalog_name_is_not_unique_fn(void *arg, const char *name)
 {
   CatalogUniqueNameFnData &fn_data = *static_cast<CatalogUniqueNameFnData *>(arg);
   std::string fullpath = to_full_path(fn_data.parent_path, name);
-  if (fn_data.catalog_service.find_catalog_from_path(fullpath)) {
+  if (fn_data.catalog_service.find_catalog_by_path(fullpath)) {
     return true;
   }
   return false;
diff --git a/source/blender/editors/space_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc
index 19e8a1094ae..a66e286501a 100644
--- a/source/blender/editors/space_file/asset_catalog_tree_view.cc
+++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc
@@ -147,7 +147,7 @@ void AssetCatalogTreeView::build_tree()
 
   if (AssetCatalogTree *catalog_tree = library_ ? library_->catalog_service->get_catalog_tree() :
                                                   nullptr) {
-    catalog_tree->foreach_child([this](AssetCatalogTreeItem &item) {
+    catalog_tree->foreach_root_item([this](AssetCatalogTreeItem &item) {
       ui::BasicTreeViewItem &child_view_item = build_recursive(*this, item);
 
       /* Open root-level items by default. */