[Bf-blender-cvs] [dd20346] asset-engine: Merge branch 'asset-experiments' into asset-engine

[Bastien Montagne]

Commit: dd2034623caed3e38f4774ab2e9405e957c68e40
Author: Bastien Montagne
Date:   Sat May 9 16:43:22 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBdd2034623caed3e38f4774ab2e9405e957c68e40

Merge branch 'asset-experiments' into asset-engine

===================================================================



===================================================================

diff --cc source/blender/editors/include/ED_fileselect.h
index dbec9ad,186a2a2..14b8e23
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@@ -32,8 -32,8 +32,9 @@@
  #define __ED_FILESELECT_H__
  
  struct ARegion;
 +struct AssetEngine;
  struct FileSelectParams;
+ struct ScrArea;
  struct SpaceFile;
  struct bContext;
  struct wmWindowManager;
diff --cc source/blender/editors/space_file/filelist.c
index 5d6e6b4,c197e1a..25d9cbc
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -2703,13 -2529,11 +2705,16 @@@ static void filelist_readjob_endjob(voi
  {
  	FileListReadJob *flrj = flrjv;
  
+ 	/* In case there would be some dangling update... */
+ 	filelist_readjob_update(flrjv);
+ 
  	flrj->filelist->filelist_pending = false;
  	flrj->filelist->filelist_ready = true;
 +
 +	if (flrj->filelist->ae) {
 +		AssetEngine *ae = flrj->filelist->ae;
 +		ae->type->kill(ae, flrj->ae_job_id);
 +	}
  }
  
  static void filelist_readjob_free(void *flrjv)
diff --cc source/blender/editors/space_file/filelist.h
index be8b313,4ac3720..fda2795
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@@ -114,11 -113,9 +114,11 @@@ struct BlendHandle *filelist_lib(struc
  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);
+ void                filelist_readjob_stop(struct wmWindowManager *wm, struct ScrArea *sa);
+ int                 filelist_readjob_running(struct wmWindowManager *wm, struct ScrArea *sa);
  
  bool                filelist_cache_previews_update(struct FileList *filelist);
  void                filelist_cache_previews_set(struct FileList *filelist, const bool use_previews);