Revert "Merge branch 'asset-engine' into asset-experiments"

This reverts commit ccd14792005083e4da5fdca2e82dfa6093082f35, reversing
changes made to 8da3bb3885e803c67f1d06e4fc2f11d98d9011b9.

Conflicts:
	release/scripts/startup/bl_operators/__init__.py
	release/scripts/startup/bl_operators/amber.py
	source/blender/blenkernel/BKE_asset.h
	source/blender/blenkernel/intern/asset.c
	source/blender/editors/space_file/file_ops.c
	source/blender/makesrna/intern/rna_asset.c

1 files changed, 7 insertions, 12 deletions

diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index 92b3c075877..fd1dd66c113 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -37,13 +37,7 @@
 extern "C" {
 #endif
 
-#include "BKE_asset.h"
-
-struct AssetEngineType;
-struct AssetEngine;
 struct BlendHandle;
-struct FileDirEntry;
-struct FileDirEntryArr;
 struct FileList;
 struct FileSelection;
 struct FolderList;
@@ -61,6 +55,12 @@ typedef enum FileSelType {
 	FILE_SEL_TOGGLE = 2
 } FileSelType;
 
+typedef enum FileCheckType {
+	CHECK_DIRS = 1,
+	CHECK_FILES = 2,
+	CHECK_ALL = 3
+} FileCheckType;
+
 struct ListBase *   folderlist_new(void);
 void                folderlist_free(struct ListBase *folderlist);
 struct ListBase *   folderlist_duplicate(ListBase *folderlist);
@@ -90,14 +90,12 @@ struct FileList *   filelist_new(short type);
 void                filelist_clear(struct FileList *filelist);
 void                filelist_free(struct FileList *filelist);
 
-void                filelist_assetengine_set(struct FileList *filelist, struct AssetEngineType *aet);
-
 const char *        filelist_dir(struct FileList *filelist);
 void                filelist_setdir(struct FileList *filelist, char *r_dir);
 
 int                 filelist_empty(struct FileList *filelist);
 int                 filelist_numfiles(struct FileList *filelist);
-struct FileDirEntry *filelist_file(struct FileList *filelist, int index);
+FileDirEntry *      filelist_file(struct FileList *filelist, int index);
 int                 filelist_find(struct FileList *filelist, const char *file);
 
 bool                filelist_force_reset(struct FileList *filelist);
@@ -109,7 +107,6 @@ void                filelist_clear_refresh(struct FileList *filelist);
 void                filelist_select(struct FileList *filelist, FileSelection *sel, FileSelType select, unsigned int flag, FileCheckType check);
 void                filelist_select_file(struct FileList *filelist, int index, FileSelType select, unsigned int flag, FileCheckType check);
 bool                filelist_is_selected(struct FileList *filelist, int index, FileCheckType check);
-struct FileDirEntryArr *filelist_selection_get(struct FileList *filelist, FileCheckType check, const char *name, const bool use_ae);
 
 void                filelist_setrecursion(struct FileList *filelist, const int recursion_level);
 
@@ -117,8 +114,6 @@ struct BlendHandle *filelist_lib(struct FileList *filelist);
 bool                filelist_islibrary(struct FileList *filelist, char *dir, char **group);
 void                filelist_freelib(struct FileList *filelist);
 
-struct AssetEngine *filelist_assetengine_get(struct FileList *filelist);
-
 void                filelist_readjob_start(struct FileList *filelist, const struct bContext *C);
 void                filelist_readjob_stop(struct wmWindowManager *wm, struct FileList *filelist);
 int                 filelist_readjob_running(struct wmWindowManager *wm, struct FileList *filelist);