diff options
-rw-r--r-- | source/blender/blenkernel/BKE_asset_catalog.hh | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/asset_catalog.cc | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_asset_catalog.hh b/source/blender/blenkernel/BKE_asset_catalog.hh index 65082f06f3a..8afc4fe2ad2 100644 --- a/source/blender/blenkernel/BKE_asset_catalog.hh +++ b/source/blender/blenkernel/BKE_asset_catalog.hh @@ -134,7 +134,7 @@ class AssetCatalogService { Map<CatalogID, std::unique_ptr<AssetCatalog>> catalogs_; Map<CatalogID, std::unique_ptr<AssetCatalog>> deleted_catalogs_; std::unique_ptr<AssetCatalogDefinitionFile> catalog_definition_file_; - std::unique_ptr<AssetCatalogTree> catalog_tree_; + std::unique_ptr<AssetCatalogTree> catalog_tree_ = std::make_unique<AssetCatalogTree>(); CatalogFilePath asset_library_root_; void load_directory_recursive(const CatalogFilePath &directory_path); diff --git a/source/blender/blenkernel/intern/asset_catalog.cc b/source/blender/blenkernel/intern/asset_catalog.cc index 4973de20fb3..2c7cf28d60d 100644 --- a/source/blender/blenkernel/intern/asset_catalog.cc +++ b/source/blender/blenkernel/intern/asset_catalog.cc @@ -171,11 +171,8 @@ AssetCatalog *AssetCatalogService::create_catalog(const AssetCatalogPath &catalo catalog_definition_file_->add_new(catalog_ptr); } - /* The tree may not exist; this happens when no catalog definition file has been loaded yet. When - * the tree is created any in-memory catalogs will be added, so it doesn't need to happen now. */ - if (catalog_tree_) { - catalog_tree_->insert_item(*catalog_ptr); - } + BLI_assert_msg(catalog_tree_, "An Asset Catalog tree should always exist."); + catalog_tree_->insert_item(*catalog_ptr); return catalog_ptr; } |