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

[Bastien Montagne]

Commit: 4e2f5a646156e63d8c48979e76742bb8d3deff62
Author: Bastien Montagne
Date:   Thu Jul 16 19:46:35 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB4e2f5a646156e63d8c48979e76742bb8d3deff62

Merge branch 'asset-experiments' into asset-engine

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

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 7f3110a,4e56b5b..b442da6
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -2051,8 -2004,8 +2070,8 @@@ static int file_rename_exec(bContext *C
  	
  	if (sfile->params) {
  		int idx = sfile->params->highlight_file;
 -		int numfiles = filelist_files_ensure(sfile->files);
 +		int numfiles = filelist_files_ensure(sfile->files, sfile->params);
- 		if ( (0 <= idx) && (idx < numfiles) ) {
+ 		if ((0 <= idx) && (idx < numfiles)) {
  			FileDirEntry *file = filelist_file(sfile->files, idx);
  			filelist_entry_select_index_set(sfile->files, idx, FILE_SEL_ADD, FILE_SEL_EDITING, CHECK_ALL);
  			BLI_strncpy(sfile->params->renameedit, file->relpath, FILE_MAXFILE);