blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

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
This commit is contained in:
Philipp Oeser 2020-01-03 11:08:42 +01:00
parent b6bcfd2a6e
commit cb1f48ab7f
Notes: blender-bot 2023-02-14 03:29:37 +01:00 
Referenced by issue #73662, Outliner filtering by selected - unselected parented objects are visible
Referenced by issue #69246, Outliner - Objects Filter Selected, Hidden and Active not working properly when parenting is involved
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -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;
}