[Bf-blender-cvs] [04f6f1d] gooseberry: Merge branch 'master' into gooseberry
Antony Riakiotakis
noreply at git.blender.org
Fri Jun 12 11:21:24 CEST 2015
Commit: 04f6f1d7f44861fa0fb88e659712cae72d5a3ea0
Author: Antony Riakiotakis
Date: Fri Jun 12 11:20:54 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB04f6f1d7f44861fa0fb88e659712cae72d5a3ea0
Merge branch 'master' into gooseberry
===================================================================
===================================================================
diff --cc source/blender/editors/space_file/file_ops.c
index 19dbaef,db93000..500b682
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@@ -274,12 -326,11 +326,12 @@@ static int file_border_select_modal(bCo
if (FILENAME_IS_CURRPAR(file->relname)) {
file->selflag &= ~FILE_SEL_HIGHLIGHTED;
+ file->collapsed_info.curfra = 0;
}
- /* active_file gets highlighted as well - make sure it is no readonly file */
+ /* make sure highlight_file is no readonly file */
if (sel.last == idx) {
- params->active_file = idx;
+ params->highlight_file = idx;
}
}
}
diff --cc source/blender/editors/space_file/space_file.c
index 07bf813,c7e0e4a..c662d75
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@@ -212,12 -212,11 +212,12 @@@ static void file_refresh(const bContex
if (!sfile->files) {
sfile->files = filelist_new(params->type);
filelist_setdir(sfile->files, params->dir);
- params->active_file = -1; /* added this so it opens nicer (ton) */
+ params->highlight_file = -1; /* added this so it opens nicer (ton) */
}
filelist_setsorting(sfile->files, params->sort);
- filelist_setfilter_options(sfile->files, params->flag & FILE_HIDE_DOT,
+ filelist_setfilter_options(sfile->files, (params->flag & FILE_HIDE_DOT) != 0,
false, /* TODO hide_parent, should be controllable? */
+ (params->flag & FILE_COLLAPSE_IMAGES) != 0,
params->flag & FILE_FILTER ? params->filter : 0,
params->filter_glob,
params->filter_search);
More information about the Bf-blender-cvs
mailing list