[Bf-blender-cvs] [a879dd3] master: FileBrowser: Fix broken 'extend' behavior of walk select mode.
Bastien Montagne
noreply at git.blender.org
Tue Aug 25 19:37:56 CEST 2015
Commit: a879dd368cec3d55875c2acfb8bd2c6d8f6f5727
Author: Bastien Montagne
Date: Tue Aug 25 19:32:30 2015 +0200
Branches: master
https://developer.blender.org/rBa879dd368cec3d55875c2acfb8bd2c6d8f6f5727
FileBrowser: Fix broken 'extend' behavior of walk select mode.
Glitch when I merged new walk code in asset-experiments most likely...
Thanks to Dalai (dfelinto) who notified that on IRC.
===================================================================
M source/blender/editors/space_file/file_ops.c
===================================================================
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 7736a81..7f5e6b9 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -491,13 +491,13 @@ static bool file_walk_select_selection_set(
if (has_selection) {
if (extend &&
- filelist_entry_select_index_get(files, active_old, FILE_SEL_SELECTED) &&
- filelist_entry_select_index_get(files, active_new, FILE_SEL_SELECTED))
+ filelist_entry_select_index_get(files, active_old, CHECK_ALL) &&
+ filelist_entry_select_index_get(files, active_new, CHECK_ALL))
{
/* conditions for deselecting: initial file is selected, new file is
* selected and either other_side isn't selected/found or we use fill */
deselect = (fill || other_site == -1 ||
- !filelist_entry_select_index_get(files, other_site, FILE_SEL_SELECTED));
+ !filelist_entry_select_index_get(files, other_site, CHECK_ALL));
/* don't change highlight_file here since we either want to deselect active or we want to
* walk through a block of selected files without selecting/deselecting anything */
More information about the Bf-blender-cvs
mailing list