diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-01-03 13:08:42 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-01-07 13:53:27 +0300 |
commit | cb1f48ab7f5024715a898b767576ce4258098516 (patch) | |
tree | a701bd9767d454e07a6085df441e4d3bab1ccff2 /source/blender | |
parent | b6bcfd2a6e73f25f9d60df8ea41e30cb9c57a1a2 (diff) |
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
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |