[Bf-blender-cvs] [cb1f48ab7f5] master: Fix T69246: Outliner - Objects Filter Selected, Hidden and Active not working properly
Philipp Oeser
noreply at git.blender.org
Tue Jan 7 11:54:22 CET 2020
Commit: cb1f48ab7f5024715a898b767576ce4258098516
Author: Philipp Oeser
Date: Fri Jan 3 11:08:42 2020 +0100
Branches: master
https://developer.blender.org/rBcb1f48ab7f5024715a898b767576ce4258098516
Fix T69246: Outliner - Objects Filter Selected, Hidden and Active not
working properly
'outliner_extract_children_from_subtree()' (introduced in
rB40a1c671655c) was extracting the children of non-matching parents
regardless of their own matching state.
Now properly filter the subtree prior to extracting.
Maniphest Tasks: T69246
Differential Revision: https://developer.blender.org/D6517
===================================================================
M source/blender/editors/space_outliner/outliner_tree.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 7f7cfff12ef..ed0d85477f1 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -2186,6 +2186,8 @@ static int outliner_filter_subtree(SpaceOutliner *soops,
te_next = te->next;
if ((outliner_element_visible_get(view_layer, te, exclude_filter) == false)) {
/* Don't free the tree, but extract the children from the parent and add to this tree. */
+ /* This also needs filtering the subtree prior (see T69246). */
+ outliner_filter_subtree(soops, view_layer, &te->subtree, search_string, exclude_filter);
te_next = outliner_extract_children_from_subtree(te, lb);
continue;
}
More information about the Bf-blender-cvs
mailing list