[Bf-blender-cvs] [6025acafd4d] node-add-asset-menu: Working asset catalogs

[Hans Goudey]

Commit: 6025acafd4d5bf0d12561dd773354dfd3f2cdbac
Author: Hans Goudey
Date:   Wed Oct 5 15:47:50 2022 -0500
Branches: node-add-asset-menu
https://developer.blender.org/rB6025acafd4d5bf0d12561dd773354dfd3f2cdbac

Working asset catalogs

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

M	source/blender/editors/space_node/add_menu_assets.cc

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

diff --git a/source/blender/editors/space_node/add_menu_assets.cc b/source/blender/editors/space_node/add_menu_assets.cc
index 014fb9bb84d..3dbad2a1e45 100644
--- a/source/blender/editors/space_node/add_menu_assets.cc
+++ b/source/blender/editors/space_node/add_menu_assets.cc
@@ -35,7 +35,7 @@ static void gather_items_for_asset_library(const bContext &C,
                                            const bke::AssetCatalogPath &path,
                                            Vector<AssetItem> &assets)
 {
-  const bke::AssetCatalogFilter filter = library.catalog_service->create_catalog_filter(path);
+  const Set<bke::CatalogID> catalog_ids = library.catalog_service->catalogs_for_path(path);
   AssetFilterSettings type_filter{};
   type_filter.id_types = FILTER_ID_NT;
 
@@ -47,7 +47,7 @@ static void gather_items_for_asset_library(const bContext &C,
       return true;
     }
     const AssetMetaData *meta_data = ED_asset_handle_get_metadata(&asset);
-    if (!filter.contains(meta_data->catalog_id)) {
+    if (!catalog_ids.contains(meta_data->catalog_id)) {
       return true;
     }
     const AssetMetaData &asset_data = *ED_asset_handle_get_metadata(&asset);