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

[Bastien Montagne]

Commit: a2b4d96b65f2dfa9fd27b694f48706b476eed038
Author: Bastien Montagne
Date:   Tue Apr 7 15:07:47 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBa2b4d96b65f2dfa9fd27b694f48706b476eed038

Merge branch 'asset-experiments' into asset-engine

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



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

diff --cc source/blender/editors/space_file/filelist.c
index 2927ff7,8169a57..123634e
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -2164,10 -2125,9 +2167,9 @@@ static int filelist_readjob_list_lib(co
  		return nbr_entries;
  	}
  
 -	/* memory for strings is passed into filelist[i].entry->relpath and freed in filelist_entry_free. */
 +	/* memory for strings is passed into filelist[i].entry->relpath and freed in BKE_filedir_entry_free. */
  	if (group) {
  		idcode = groupname_to_code(group);
- //		previews = BLO_blendhandle_get_previews(libfiledata, idcode, &nprevs);
  		names = BLO_blendhandle_get_datablock_names(libfiledata, idcode, &nnames);
  	}
  	else {