From 45e7d609cebc6bd062932bb06c3b45a75e1ca4af Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 25 May 2018 13:42:20 +0200 Subject: 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. --- source/blender/editors/space_outliner/outliner_tree.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_outliner') 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; -- cgit v1.2.3