[Bf-blender-cvs] [8b1759d11a6] asset-engine: Merge branch 'master' into asset-engine

[Bastien Montagne]

Commit: 8b1759d11a6b1e966f19e388dd67c3bd4eef190d
Author: Bastien Montagne
Date:   Sun Oct 8 16:33:44 2017 +0200
Branches: asset-engine
https://developer.blender.org/rB8b1759d11a6b1e966f19e388dd67c3bd4eef190d

Merge branch 'master' into asset-engine

 Conflicts:
	source/blender/editors/space_file/file_ops.c

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 73218e728f2,22c1214d928..d83f2a68cf7
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -2311,8 -2235,8 +2311,8 @@@ static int file_delete_poll(bContext *C
  	SpaceFile *sfile = CTX_wm_space_file(C);
  
  	if (sfile && sfile->params) {
- 		char dir[FILE_MAX];
+ 		char dir[FILE_MAX_LIBEXTRA];
 -		int numfiles = filelist_files_ensure(sfile->files);
 +		int numfiles = filelist_files_ensure(sfile->files, sfile->params);
  		int i;
  		int num_selected = 0;