[Bf-blender-cvs] [0f135f80f27] master: Fix outliner box select not working when using search filter.
Brecht Van Lommel
noreply at git.blender.org
Thu Feb 14 20:11:33 CET 2019
Commit: 0f135f80f271a46f8a4e373e33cd7ae075545e19
Author: Brecht Van Lommel
Date: Thu Feb 14 20:08:10 2019 +0100
Branches: master
https://developer.blender.org/rB0f135f80f271a46f8a4e373e33cd7ae075545e19
Fix outliner box select not working when using search filter.
===================================================================
M source/blender/editors/space_outliner/outliner_select.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 05ff447cec0..3bc03902813 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -1180,7 +1180,7 @@ void OUTLINER_OT_item_activate(wmOperatorType *ot)
/* ****************************************************** */
/* **************** Box Select Tool ****************** */
-static void outliner_item_box_select(Scene *scene, rctf *rectf, TreeElement *te, bool select)
+static void outliner_item_box_select(SpaceOops *soops, Scene *scene, rctf *rectf, TreeElement *te, bool select)
{
TreeStoreElem *tselem = TREESTORE(te);
@@ -1194,9 +1194,9 @@ static void outliner_item_box_select(Scene *scene, rctf *rectf, TreeElement *te,
}
/* Look at its children. */
- if ((tselem->flag & TSE_CLOSED) == 0) {
+ if (TSELEM_OPEN(tselem, soops)) {
for (te = te->subtree.first; te; te = te->next) {
- outliner_item_box_select(scene, rectf, te, select);
+ outliner_item_box_select(soops, scene, rectf, te, select);
}
}
}
@@ -1214,7 +1214,7 @@ static int outliner_box_select_exec(bContext *C, wmOperator *op)
UI_view2d_region_to_view_rctf(&ar->v2d, &rectf, &rectf);
for (te = soops->tree.first; te; te = te->next) {
- outliner_item_box_select(scene, &rectf, te, select);
+ outliner_item_box_select(soops, scene, &rectf, te, select);
}
DEG_id_tag_update(&scene->id, ID_RECALC_SELECT);
More information about the Bf-blender-cvs
mailing list