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

[Bastien Montagne]

Commit: 37a6a92f7694015bb7e16adffa1a58e913e5d391
Author: Bastien Montagne
Date:   Sat Jul 11 23:00:56 2015 +0200
Branches: asset-engine
https://developer.blender.org/rB37a6a92f7694015bb7e16adffa1a58e913e5d391

Merge branch 'asset-experiments' into asset-engine

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

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



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

diff --cc source/blender/editors/space_file/file_intern.h
index 9b424c8,baafefa..53c8f5a
--- a/source/blender/editors/space_file/file_intern.h
+++ b/source/blender/editors/space_file/file_intern.h
@@@ -107,8 -107,12 +107,9 @@@ void file_filename_enter_handle(bContex
  
  int file_highlight_set(struct SpaceFile *sfile, struct ARegion *ar, int mx, int my);
  
 -void file_sfile_to_operator(struct wmOperator *op, struct SpaceFile *sfile, char *filepath);
 -void file_operator_to_sfile(struct SpaceFile *sfile, struct wmOperator *op);
 -
  
  /* filesel.c */
+ void fileselect_file_set(SpaceFile *sfile, const int index);
  float file_string_width(const char *str);
  
  float file_font_pointsize(void);
diff --cc source/blender/editors/space_file/file_ops.c
index 2f3c12b,fe58742..7f3110a
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -422,16 -422,12 +424,12 @@@ static int file_select_invoke(bContext 
  
  	if (sfile && sfile->params) {
  		int idx = sfile->params->highlight_file;
 -		int numfiles = filelist_files_ensure(sfile->files);
 +		int numfiles = filelist_files_ensure(sfile->files, ED_fileselect_get_params(sfile));
  
  		if ((idx >= 0) && (idx < numfiles)) {
- 			struct FileDirEntry *file = filelist_file(sfile->files, idx);
- 			if (FILENAME_IS_CURRPAR(file->relpath)) {
- 				/* skip - If a readonly file (".." or ".") is selected, skip deselect all! */
- 			}
- 			else {
- 				/* single select, deselect all selected first */
- 				if (!extend) file_deselect_all(sfile, FILE_SEL_SELECTED);
+ 			/* single select, deselect all selected first */
+ 			if (!extend) {
+ 				file_deselect_all(sfile, FILE_SEL_SELECTED);
  			}
  		}
  	}
@@@ -1322,9 -1270,24 +1336,24 @@@ int file_exec(bContext *C, wmOperator *
  {
  	wmWindowManager *wm = CTX_wm_manager(C);
  	SpaceFile *sfile = CTX_wm_space_file(C);
+ 	const struct FileDirEntry *file = filelist_file(sfile->files, sfile->params->active_file);
 -	char filepath[FILE_MAX];
 -
 +	char filepath[FILE_MAX_LIBEXTRA];
 +	
- 	if (sfile->op) {
+ 	/* directory change */
+ 	if (file && (file->typeflag & FILE_TYPE_DIR)) {
+ 		if (FILENAME_IS_PARENT(file->relpath)) {
+ 			BLI_parent_dir(sfile->params->dir);
+ 		}
+ 		else if (file->relpath) {
+ 			BLI_cleanup_dir(G.main->name, sfile->params->dir);
+ 			strcat(sfile->params->dir, file->relpath);
+ 			BLI_add_slash(sfile->params->dir);
+ 		}
+ 
+ 		ED_file_change_dir(C, false);
+ 	}
+ 	/* opening file - sends events now, so things get handled on windowqueue level */
+ 	else if (sfile->op) {
  		wmOperator *op = sfile->op;
  	
  		/* when used as a macro, for doubleclick,