[Bf-blender-cvs] [548029c] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 548029c000e285992ae84065ba10acc56cc571e3
Author: Bastien Montagne
Date:   Tue Jan 13 16:42:33 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB548029c000e285992ae84065ba10acc56cc571e3

Merge branch 'master' into asset-experiments

Conflicts:
	release/scripts/startup/bl_ui/space_filebrowser.py

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



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

diff --cc release/scripts/startup/bl_ui/space_filebrowser.py
index c99d00b,6ba8ddf..2b4b553
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@@ -57,8 -55,7 +57,8 @@@ class FILEBROWSER_HT_header(Header)
              layout.prop(params, "display_type", expand=True, text="")
              layout.prop(params, "sort_method", expand=True, text="")
  
 +            layout.prop(params, "recursion_level", slider=True)
-             layout.prop(params, "show_hidden")
+             layout.prop(params, "show_hidden", text="", icon='FILE_HIDDEN')
              layout.prop(params, "use_filter", text="", icon='FILTER')
  
              row = layout.row(align=True)