diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-25 14:42:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-05-25 14:48:29 +0300 |
| commit | 45e7d609cebc6bd062932bb06c3b45a75e1ca4af (patch) | |
| tree | 4704b6c13d5846823ce06ce3736eaac4d1b28c59 /source/blender/editors/space_outliner/outliner_tree.c | |
| parent | 2cc53227ab237989edf7758f91c260089758edb5 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; |