[Bf-blender-cvs] [30db6e0] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 30db6e0cb75476cd7e0b5420a343ca9e44d0d9d1
Author: Bastien Montagne
Date:   Wed Feb 3 10:06:45 2016 +0100
Branches: asset-engine
https://developer.blender.org/rB30db6e0cb75476cd7e0b5420a343ca9e44d0d9d1

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 0f12eb1,ddb8b1c..f19c310
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -2331,9 -2266,11 +2334,11 @@@ int file_delete_exec(bContext *C, wmOpe
  	SpaceFile *sfile = CTX_wm_space_file(C);
  	ScrArea *sa = CTX_wm_area(C);
  	FileDirEntry *file;
 -	int numfiles = filelist_files_ensure(sfile->files);
 +	int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
  	int i;
  
+ 	bool report_error = false;
+ 	errno = 0;
  	for (i = 0; i < numfiles; i++) {
  		if (filelist_entry_select_index_get(sfile->files, i, CHECK_FILES)) {
  			file = filelist_file(sfile->files, i);