1 files changed, 13 insertions, 64 deletions

diff --git a/source/blender/editors/include/ED_asset.h b/source/blender/editors/include/ED_asset.h
index 0058c0615c3..42faf716560 100644
--- a/source/blender/editors/include/ED_asset.h
+++ b/source/blender/editors/include/ED_asset.h
@@ -16,66 +16,19 @@
 
 /** \file
  * \ingroup editors
+ *
+ * The public API for assets is defined in dedicated headers. This is a utility file that just
+ * includes all of these.
  */
 
 #pragma once
 
-#include "DNA_ID_enums.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct AssetFilterSettings;
-struct AssetLibraryReference;
-struct Main;
-struct ReportList;
-struct bContext;
-struct wmNotifier;
-
-typedef struct AssetTempIDConsumer AssetTempIDConsumer;
-
-bool ED_asset_mark_id(const struct bContext *C, struct ID *id);
-bool ED_asset_clear_id(struct ID *id);
-
-bool ED_asset_can_make_single_from_context(const struct bContext *C);
-
-int ED_asset_library_reference_to_enum_value(const struct AssetLibraryReference *library);
-struct AssetLibraryReference ED_asset_library_reference_from_enum_value(int value);
-
-const char *ED_asset_handle_get_name(const AssetHandle *asset);
-void ED_asset_handle_get_full_library_path(const struct bContext *C,
-                                           const AssetLibraryReference *asset_library,
-                                           const AssetHandle *asset,
-                                           char r_full_lib_path[]);
-
-AssetTempIDConsumer *ED_asset_temp_id_consumer_create(const AssetHandle *handle);
-void ED_asset_temp_id_consumer_free(AssetTempIDConsumer **consumer);
-struct ID *ED_asset_temp_id_consumer_ensure_local_id(AssetTempIDConsumer *consumer,
-                                                     const struct bContext *C,
-                                                     const AssetLibraryReference *asset_library,
-                                                     ID_Type id_type,
-                                                     struct Main *bmain,
-                                                     struct ReportList *reports);
-
-void ED_assetlist_storage_fetch(const struct AssetLibraryReference *library_reference,
-                                const struct AssetFilterSettings *filter_settings,
-                                const struct bContext *C);
-void ED_assetlist_ensure_previews_job(const struct AssetLibraryReference *library_reference,
-                                      struct bContext *C);
-void ED_assetlist_clear(const struct AssetLibraryReference *library_reference, struct bContext *C);
-bool ED_assetlist_storage_has_list_for_library(const AssetLibraryReference *library_reference);
-void ED_assetlist_storage_tag_main_data_dirty(void);
-void ED_assetlist_storage_id_remap(struct ID *id_old, struct ID *id_new);
-void ED_assetlist_storage_exit(void);
-
-ID *ED_assetlist_asset_local_id_get(const AssetHandle *asset_handle);
-struct ImBuf *ED_assetlist_asset_image_get(const AssetHandle *asset_handle);
-const char *ED_assetlist_library_path(const struct AssetLibraryReference *library_reference);
-
-bool ED_assetlist_listen(const struct AssetLibraryReference *library_reference,
-                         const struct wmNotifier *notifier);
-int ED_assetlist_size(const struct AssetLibraryReference *library_reference);
+/* Barely anything here. Just general editor level functions. Actual asset level code is in
+ * dedicated headers. */
 
 void ED_operatortypes_asset(void);
 
@@ -83,17 +36,13 @@ void ED_operatortypes_asset(void);
 }
 #endif
 
-/* TODO move to C++ asset-list header? */
-#ifdef __cplusplus
+#include "../asset/ED_asset_handle.h"
+#include "../asset/ED_asset_library.h"
+#include "../asset/ED_asset_list.h"
+#include "../asset/ED_asset_mark_clear.h"
+#include "../asset/ED_asset_temp_id_consumer.h"
 
-#  include <string>
-
-std::string ED_assetlist_asset_filepath_get(const bContext *C,
-                                            const AssetLibraryReference &library_reference,
-                                            const AssetHandle &asset_handle);
-
-#  include "BLI_function_ref.hh"
-/* Can return false to stop iterating. */
-using AssetListIterFn = blender::FunctionRef<bool(FileDirEntry &)>;
-void ED_assetlist_iterate(const AssetLibraryReference *library_reference, AssetListIterFn fn);
+/* C++ only headers. */
+#ifdef __cplusplus
+#  include "../asset/ED_asset_list.hh"
 #endif