diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-11-11 04:14:48 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-11-11 04:41:13 +0300 |
| commit | 9465b109af0b70244a36f9e68493e316d9f8b56f (patch) | |
| tree | c4d933bf09f8313071556063156538ec3356b24c /source/blender/editors/space_file/asset_catalog_tree_view.cc | |
| parent | 026d21a225521670c6b5083da9da61227da69e65 (diff) | |
| parent | ca1642cd0c5cdf634fe2022c955d93983de95934 (diff) | |
Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic
Diffstat (limited to 'source/blender/editors/space_file/asset_catalog_tree_view.cc')
| -rw-r--r-- | source/blender/editors/space_file/asset_catalog_tree_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
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 4eb2958f5a2..fe2e46fc056 100644 --- a/source/blender/editors/space_file/asset_catalog_tree_view.cc +++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc @@ -708,12 +708,11 @@ bool file_set_asset_catalog_filter_settings( void file_ensure_updated_catalog_filter_data( FileAssetCatalogFilterSettingsHandle *filter_settings_handle, - const ::AssetLibrary *asset_library) + const bke::AssetLibrary *asset_library) { AssetCatalogFilterSettings *filter_settings = reinterpret_cast<AssetCatalogFilterSettings *>( filter_settings_handle); - const AssetCatalogService *catalog_service = BKE_asset_library_get_catalog_service( - asset_library); + const AssetCatalogService *catalog_service = asset_library->catalog_service.get(); if (filter_settings->asset_catalog_visibility != FILE_SHOW_ASSETS_ALL_CATALOGS) { filter_settings->catalog_filter = std::make_unique<AssetCatalogFilter>( |