[Bf-blender-cvs] [92ef1b9] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 92ef1b997b40b6589b603bb4a552ac4f1d78ca35
Author: Bastien Montagne
Date:   Wed Feb 11 11:18:42 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB92ef1b997b40b6589b603bb4a552ac4f1d78ca35

Merge branch 'master' into asset-experiments

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

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



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

diff --cc source/blender/editors/space_file/space_file.c
index 4b2a9d4,3c60233..38d49e6
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@@ -267,8 -260,7 +267,9 @@@ static void file_refresh(const bContex
  		sfile->layout->dirty = true;
  	}
  
 +	filelist_clear_refresh(sfile->files);
 +
+ 	/* Might be called with NULL sa, see file_main_area_draw() below. */
  	if (sa && BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) {
  		/* Create TOOLS/TOOL_PROPS regions. */
  		file_tools_region(sa);