Fix MSVC warnings from recent asset system changes

* Mismatching class vs struct forward declaration (one forward
  declaration wasn't needed anymore)
* Unused member warning (`on_load_callback_store_`)
This commit is contained in:
Julian Eisel
2022-11-18 15:12:45 +01:00
parent 4e38771d5c
commit 0151d846e8
3 changed files with 3 additions and 8 deletions

View File

@@ -36,7 +36,6 @@ class AssetRepresentation {
ID *local_asset_id_ = nullptr; /* Non-owning. */
};
friend struct AssetLibrary;
friend class AssetStorage;
public:

View File

@@ -146,19 +146,18 @@ void AssetLibraryService::allocate_service_instance()
}
}
#ifdef WITH_DESTROY_VIA_LOAD_HANDLER
static void on_blendfile_load(struct Main * /*bMain*/,
struct PointerRNA ** /*pointers*/,
const int /*num_pointers*/,
void * /*arg*/)
{
#ifdef WITH_DESTROY_VIA_LOAD_HANDLER
AssetLibraryService::destroy();
}
#endif
}
void AssetLibraryService::app_handler_register()
{
#ifdef WITH_DESTROY_VIA_LOAD_HANDLER
/* The callback system doesn't own `on_load_callback_store_`. */
on_load_callback_store_.alloc = false;
@@ -166,16 +165,13 @@ void AssetLibraryService::app_handler_register()
on_load_callback_store_.arg = this;
BKE_callback_add(&on_load_callback_store_, BKE_CB_EVT_LOAD_PRE);
#endif
}
void AssetLibraryService::app_handler_unregister()
{
#ifdef WITH_DESTROY_VIA_LOAD_HANDLER
BKE_callback_remove(&on_load_callback_store_, BKE_CB_EVT_LOAD_PRE);
on_load_callback_store_.func = nullptr;
on_load_callback_store_.arg = nullptr;
#endif
}
bool AssetLibraryService::has_any_unsaved_catalogs() const

View File

@@ -226,7 +226,7 @@ void file_create_asset_catalog_tree_view_in_layout(struct AssetLibrary *asset_li
#ifdef __cplusplus
namespace blender::asset_system {
struct AssetLibrary;
class AssetLibrary;
}
FileAssetCatalogFilterSettingsHandle *file_create_asset_catalog_filter_settings(void);