[Bf-blender-cvs] [13951cde59b] node-add-asset-menu: Remove some unnecessary changes

[Hans Goudey]

Commit: 13951cde59b14d35ce583f1d2fcc012d7c3c72b2
Author: Hans Goudey
Date:   Thu Oct 6 14:45:46 2022 -0500
Branches: node-add-asset-menu
https://developer.blender.org/rB13951cde59b14d35ce583f1d2fcc012d7c3c72b2

Remove some unnecessary changes

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

M	source/blender/blenkernel/BKE_asset_catalog.hh
M	source/blender/blenkernel/intern/asset_catalog.cc
M	source/blender/makesdna/DNA_asset_types.h

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

diff --git a/source/blender/blenkernel/BKE_asset_catalog.hh b/source/blender/blenkernel/BKE_asset_catalog.hh
index 18f0debfd6c..73c2e00c4c4 100644
--- a/source/blender/blenkernel/BKE_asset_catalog.hh
+++ b/source/blender/blenkernel/BKE_asset_catalog.hh
@@ -124,10 +124,7 @@ class AssetCatalogService {
    *
    * \see #AssetCatalogFilter
    */
-  AssetCatalogFilter create_catalog_filter(const AssetCatalogPath &path) const;
-  AssetCatalogFilter create_catalog_filter(CatalogID catalog_id) const;
-
-  Set<CatalogID> catalogs_for_path(const AssetCatalogPath &path) const;
+  AssetCatalogFilter create_catalog_filter(CatalogID active_catalog_id) const;
 
   /** Create a catalog with some sensible auto-generated catalog ID.
    * The catalog will be saved to the default catalog file. */
@@ -150,7 +147,6 @@ class AssetCatalogService {
   void update_catalog_path(CatalogID catalog_id, const AssetCatalogPath &new_catalog_path);
 
   AssetCatalogTree *get_catalog_tree();
-  const AssetCatalogTree *get_catalog_tree() const;
 
   /** Return true only if there are no catalogs known. */
   bool is_empty() const;
diff --git a/source/blender/blenkernel/intern/asset_catalog.cc b/source/blender/blenkernel/intern/asset_catalog.cc
index b9fe7469ead..8a28e209c6a 100644
--- a/source/blender/blenkernel/intern/asset_catalog.cc
+++ b/source/blender/blenkernel/intern/asset_catalog.cc
@@ -149,10 +149,14 @@ bool AssetCatalogService::is_catalog_known(CatalogID catalog_id) const
   return catalog_collection_->catalogs_.contains(catalog_id);
 }
 
-AssetCatalogFilter AssetCatalogService::create_catalog_filter(const AssetCatalogPath &path) const
+AssetCatalogFilter AssetCatalogService::create_catalog_filter(
+    const CatalogID active_catalog_id) const
 {
   Set<CatalogID> matching_catalog_ids;
   Set<CatalogID> known_catalog_ids;
+  matching_catalog_ids.add(active_catalog_id);
+
+  const AssetCatalog *active_catalog = find_catalog(active_catalog_id);
 
   /* This cannot just iterate over tree items to get all the required data, because tree items only
    * represent single UUIDs. It could be used to get the main UUIDs of the children, though, and
@@ -160,7 +164,7 @@ AssetCatalogFilter AssetCatalogService::create_catalog_filter(const AssetCatalog
    * call). Without an extra indexed-by-path acceleration structure, this is still going to require
    * a linear search, though. */
   for (const auto &catalog_uptr : catalog_collection_->catalogs_.values()) {
-    if (catalog_uptr->path.is_contained_in(path)) {
+    if (active_catalog && catalog_uptr->path.is_contained_in(active_catalog->path)) {
       matching_catalog_ids.add(catalog_uptr->catalog_id);
     }
     known_catalog_ids.add(catalog_uptr->catalog_id);
@@ -169,27 +173,6 @@ AssetCatalogFilter AssetCatalogService::create_catalog_filter(const AssetCatalog
   return AssetCatalogFilter(std::move(matching_catalog_ids), std::move(known_catalog_ids));
 }
 
-Set<CatalogID> AssetCatalogService::catalogs_for_path(const AssetCatalogPath &path) const
-{
-  Set<CatalogID> catalog_ids;
-  for (const auto &catalog_uptr : catalog_collection_->catalogs_.values()) {
-    if (catalog_uptr->path == path) {
-      catalog_ids.add(catalog_uptr->catalog_id);
-    }
-  }
-  return catalog_ids;
-}
-
-AssetCatalogFilter AssetCatalogService::create_catalog_filter(const CatalogID catalog_id) const
-{
-  const AssetCatalog *catalog = this->find_catalog(catalog_id);
-  if (!catalog) {
-    return AssetCatalogFilter({catalog_id}, {});
-  }
-
-  return this->create_catalog_filter(catalog->path);
-}
-
 void AssetCatalogService::delete_catalog_by_id_soft(const CatalogID catalog_id)
 {
   std::unique_ptr<AssetCatalog> *catalog_uptr_ptr = catalog_collection_->catalogs_.lookup_ptr(
@@ -564,11 +547,6 @@ AssetCatalogTree *AssetCatalogService::get_catalog_tree()
   return catalog_tree_.get();
 }
 
-const AssetCatalogTree *AssetCatalogService::get_catalog_tree() const
-{
-  return catalog_tree_.get();
-}
-
 std::unique_ptr<AssetCatalogTree> AssetCatalogService::read_into_tree()
 {
   auto tree = std::make_unique<AssetCatalogTree>();
diff --git a/source/blender/makesdna/DNA_asset_types.h b/source/blender/makesdna/DNA_asset_types.h
index c63e74dedc0..29795519719 100644
--- a/source/blender/makesdna/DNA_asset_types.h
+++ b/source/blender/makesdna/DNA_asset_types.h
@@ -53,7 +53,7 @@ typedef struct AssetMetaData {
    * Mapped to a path in the asset catalog hierarchy by an #AssetCatalogService.
    * Use #BKE_asset_metadata_catalog_id_set() to ensure a valid ID is set.
    */
-  bUUID catalog_id;
+  struct bUUID catalog_id;
   /**
    * Short name of the asset's catalog. This is for debugging purposes only, to allow (partial)
    * reconstruction of asset catalogs in the unfortunate case that the mapping from catalog UUID to