Commit: de229b4085671e9a39ae389424f543d4c8c9c70c
Author: Bastien Montagne
Date: Mon Jan 5 16:15:37 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBde229b4085671e9a39ae389424f543d4c8c9c70c
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 d136fd0,f055593..779bf18
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@@ -199,10 -198,9 +199,10 @@@ static void file_refresh(const bContex
}
if (!sfile->files) {
sfile->files = filelist_new(params->type);
- params->active_file = -1; // added this so it opens nicer (ton)
- filelist_setdir(sfile->files, params->dir);
+ params->active_file = -1; /* added this so it opens nicer (ton)
*/
}
+ filelist_setdir(sfile->files, params->dir);
+ filelist_setrecursive(sfile->files, (params->flag & FILE_SHOWFLAT) !=
0);
filelist_setsorting(sfile->files, params->sort);
filelist_setfilter_options(sfile->files, params->flag & FILE_HIDE_DOT,
false, /* TODO hide_parent,
should be controllable? */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
