[Bf-blender-cvs] [2bfd60e] asset-experiments: Merge branch 'master' into asset-experiments

Bastien Montagne noreply at git.blender.org
Thu Jul 16 16:59:07 CEST 2015


Commit: 2bfd60e54f371413ed9c26ac2ffbdcd21e2ab538
Author: Bastien Montagne
Date:   Thu Jul 16 16:53:55 2015 +0200
Branches: asset-experiments
https://developer.blender.org/rB2bfd60e54f371413ed9c26ac2ffbdcd21e2ab538

Merge branch 'master' into asset-experiments

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

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index fe58742,dddda43..4e56b5b
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -1985,11 -1989,11 +2004,11 @@@ static int file_rename_exec(bContext *C
  	
  	if (sfile->params) {
  		int idx = sfile->params->highlight_file;
 -		int numfiles = filelist_numfiles(sfile->files);
 +		int numfiles = filelist_files_ensure(sfile->files);
- 		if ( (0 <= idx) && (idx < numfiles) ) {
+ 		if ((0 <= idx) && (idx < numfiles)) {
 -			struct direntry *file = filelist_file(sfile->files, idx);
 -			filelist_select_file(sfile->files, idx, FILE_SEL_ADD, FILE_SEL_EDITING, CHECK_ALL);
 -			BLI_strncpy(sfile->params->renameedit, file->relname, FILE_MAXFILE);
 +			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);
  			sfile->params->renamefile[0] = '\0';
  		}
  		ED_area_tag_redraw(sa);




More information about the Bf-blender-cvs mailing list