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

[Bastien Montagne]

Commit: b5ee93c1a39a2f001d8e363f4ee13a46a5f2b225
Author: Bastien Montagne
Date:   Sun Sep 27 11:30:08 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBb5ee93c1a39a2f001d8e363f4ee13a46a5f2b225

Merge branch 'master' into asset-engine

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



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

diff --cc source/blender/editors/space_file/file_ops.c
index 0bff1d2,8347ad8..f4d7eb9
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -261,9 -302,23 +304,23 @@@ static FileSelect file_select(bContext 
  		}
  	}
  
 -	if (select != FILE_SEL_ADD && !file_is_any_selected(sfile->files)) {
 +	if (select != FILE_SEL_ADD && !file_is_any_selected(sfile->files, numfiles)) {
  		sfile->params->active_file = -1;
  	}
+ 	else {
+ 		ARegion *ar = CTX_wm_region(C);
+ 		const FileLayout *layout = ED_fileselect_get_layout(sfile, ar);
+ 
+ 		/* Adjust view to display selection. Doing iterations for first and last
+ 		 * selected item makes view showing as much of the selection possible.
+ 		 * Not really useful if tiles are (almost) bigger than viewbounds though. */
+ 		if (((layout->flag & FILE_LAYOUT_HOR) && ar->winx > (1.2f * layout->tile_w)) ||
+ 		    ((layout->flag & FILE_LAYOUT_VER) && ar->winy > (2.0f * layout->tile_h)))
+ 		{
+ 			file_ensure_inside_viewbounds(ar, sfile, sel.last);
+ 			file_ensure_inside_viewbounds(ar, sfile, sel.first);
+ 		}
+ 	}
  
  	/* update operator for name change event */
  	file_draw_check(C);