diff options
| author | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-04 21:15:14 +0300 |
|---|---|---|
| committer | Nathan Craddock <nzcraddock@gmail.com> | 2020-08-04 21:15:14 +0300 |
| commit | 1ae9960a15ddc9a0991715be25c31dbe56c0cb1a (patch) | |
| tree | 5472216f66d20be105fba3c3ef42aece826c4a51 /source/blender/editors/space_outliner | |
| parent | 304767dcd3459d222d8c6011e913840df74a6cd5 (diff) | |
| parent | 97be726f9319f9b5a3b076a62309549d73ea6aed (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 4 |
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. */ |