[Bf-blender-cvs] [45e7d609ceb] blender2.8: Fix outliner showing objects in collections instances.

[Brecht Van Lommel]

Commit: 45e7d609cebc6bd062932bb06c3b45a75e1ca4af
Author: Brecht Van Lommel
Date:   Fri May 25 13:42:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB45e7d609cebc6bd062932bb06c3b45a75e1ca4af

Fix outliner showing objects in collections instances.

It didn't do this before for groups, and while it could be useful this leads
to terrible performance when there are many instances.

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

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 f42addb30bf..45c19ed4ff7 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -813,8 +813,11 @@ static void outliner_add_id_contents(SpaceOops *soops, TreeElement *te, TreeStor
 		}
 		case ID_GR:
 		{
-			Collection *collection = (Collection *)id;
-			outliner_add_collection_recursive(soops, collection, te);
+			/* Don't expand for instances, creates too many elements. */
+			if (!(te->parent && te->parent->idcode == ID_OB)) {
+				Collection *collection = (Collection *)id;
+				outliner_add_collection_recursive(soops, collection, te);
+			}
 		}
 		default:
 			break;