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

[Bastien Montagne]

Commit: e8af25479d3b898d7a7813efcf02a3b3d81e8b67
Author: Bastien Montagne
Date:   Sun Aug 30 11:29:03 2015 +0200
Branches: asset-engine
https://developer.blender.org/rBe8af25479d3b898d7a7813efcf02a3b3d81e8b67

Merge branch 'asset-experiments' into asset-engine

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



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

diff --cc source/blender/editors/space_file/file_draw.c
index 81b2e19,c809b79..888a565
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@@ -501,8 -501,9 +501,9 @@@ void file_draw_list(const bContext *C, 
  	int column_space = 0.6f * UI_UNIT_X;
  	const bool small_size = SMALL_SIZE_CHECK(params->thumbnail_size);
  	const bool update_stat_strings = small_size != SMALL_SIZE_CHECK(layout->curr_size);
+ 	const float thumb_icon_aspect = sqrtf(64.0f / (float)(params->thumbnail_size));
  
 -	numfiles = filelist_files_ensure(files);
 +	numfiles = filelist_files_ensure(files, params);
  	
  	if (params->display != FILE_IMGDISPLAY) {