Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Craddock <nzcraddock@gmail.com>2020-08-04 20:45:35 +0300
committerNathan Craddock <nzcraddock@gmail.com>2020-08-04 21:05:05 +0300
commit97be726f9319f9b5a3b076a62309549d73ea6aed (patch)
treec3a064ce9f4be278cffc8ee0b9c9cdca0b5813cd /source/blender/editors/space_outliner/outliner_tree.c
parente4370eccdf8e718b4d20ad6121145883407f686e (diff)
Fix T74796: Outliner child objects hidden when collections are filtered
Filtering Collections when also filtering object children would only display the parent object. Add a check for the NO_CHILDREN filter before creating the object-parent hierarchy.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index db42fb8f319..e1d92c551c3 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -2461,7 +2461,9 @@ void outliner_build_tree(
te_object->directdata = base;
}
- outliner_make_object_parent_hierarchy(&soops->tree);
+ if ((soops->filter & SO_FILTER_NO_CHILDREN) == 0) {
+ outliner_make_object_parent_hierarchy(&soops->tree);
+ }
}
else {
/* Show collections in the view layer. */