[Bf-blender-cvs] [97be726f931] blender-v2.90-release: Fix T74796: Outliner child objects hidden when collections are filtered

[Nathan Craddock]

Commit: 97be726f9319f9b5a3b076a62309549d73ea6aed
Author: Nathan Craddock
Date:   Tue Aug 4 11:45:35 2020 -0600
Branches: blender-v2.90-release
https://developer.blender.org/rB97be726f9319f9b5a3b076a62309549d73ea6aed

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.

===================================================================

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 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. */