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

[Bastien Montagne]

Commit: 75ef507e7063d871155f7dddae92d4a47879fb9c
Author: Bastien Montagne
Date:   Sat Apr 4 15:07:21 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB75ef507e7063d871155f7dddae92d4a47879fb9c

Merge branch 'asset-experiments' into asset-engine

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



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

diff --cc source/blender/editors/space_file/filelist.h
index 1164a98,e76616b..c0ac1f4
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@@ -91,8 -90,9 +91,9 @@@ void                filelist_setdir(str
  
  int                 filelist_empty(struct FileList *filelist);
  int                 filelist_numfiles(struct FileList *filelist);
 -FileDirEntry *      filelist_file(struct FileList *filelist, int index);
 +struct FileDirEntry *filelist_file(struct FileList *filelist, int index);
  int                 filelist_file_findpath(struct FileList *filelist, const char *file);
+ FileDirEntry *      filelist_entry_find_uuid(struct FileList *filelist, const char uuid[ASSET_UUID_LENGTH]);
  bool                filelist_file_cache_block(struct FileList *filelist, const int index);
  
  bool                filelist_force_reset(struct FileList *filelist);