[Bf-blender-cvs] [f45f8a7a898] blender-v2.90-release: Fix T79278: Selected object filter skipping collection instances

[Nathan Craddock]

Commit: f45f8a7a898575819a8c687ed6935ee94ddefa8e
Author: Nathan Craddock
Date:   Wed Jul 29 21:46:04 2020 -0600
Branches: blender-v2.90-release
https://developer.blender.org/rBf45f8a7a898575819a8c687ed6935ee94ddefa8e

Fix T79278: Selected object filter skipping collection instances

Collection instance datablocks were not filtered out when only showing
the selected object. They were treated as a collection (which should
show when filtering objects). Adds a case to check if the parent is an
object.

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

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 09dc1320c3a..db42fb8f319 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -2192,7 +2192,9 @@ static bool outliner_element_is_collection_or_object(TreeElement *te)
   if ((tselem->type == 0) && (te->idcode == ID_OB)) {
     return true;
   }
-  if (outliner_is_collection_tree_element(te)) {
+
+  /* Collection instance datablocks should not be extracted. */
+  if (outliner_is_collection_tree_element(te) && !(te->parent && te->parent->idcode == ID_OB)) {
     return true;
   }