[Bf-blender-cvs] [97a00b9] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 97a00b91998b101328ad7192611c43362f17dd47
Author: Bastien Montagne
Date:   Sat Jan 3 22:05:01 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB97a00b91998b101328ad7192611c43362f17dd47

Merge branch 'master' into asset-experiments

Conflicts:
	release/scripts/startup/bl_ui/space_filebrowser.py
	source/blender/editors/space_file/filelist.c
	source/blender/editors/space_file/filelist.h
	source/blender/editors/space_file/space_file.c
	source/blender/makesdna/DNA_space_types.h
	source/blender/makesrna/intern/rna_space.c

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



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

diff --cc source/blender/editors/space_file/filelist.c
index 3dadaa8,5f25636..8478f00
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@@ -670,8 -573,9 +670,9 @@@ void filelist_filter(FileList *filelist
  	MEM_freeN(fidx_tmp);
  }
  
- void filelist_setfilter_options(FileList *filelist, const bool hide_dot, const bool hide_parent, const unsigned int filter,
-                                 const unsigned int filter_id, const char *filter_glob, const char *filter_search)
+ void filelist_setfilter_options(FileList *filelist, const bool hide_dot, const bool hide_parent,
 -                                const unsigned int filter,
++                                const unsigned int filter, const unsigned int filter_id,
+                                 const char *filter_glob, const char *filter_search)
  {
  	if ((filelist->filter_data.hide_dot != hide_dot) ||
  	    (filelist->filter_data.hide_parent != hide_parent) ||