From 5a10c64e8cc6525f24ce6ac05a2c7d50aa16fb8f Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 15 Feb 2017 19:08:23 +0100 Subject: Layers: Show collection objects in Outliner --- source/blender/editors/space_outliner/outliner_tree.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to '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 bbabb9e2d7a..62ab69ebda2 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -84,6 +84,9 @@ # include "BLI_math_base.h" /* M_PI */ #endif +/* prototypes */ +static void outliner_make_hierarchy(ListBase *lb); + /* ********************************************************* */ /* Persistent Data */ @@ -1383,6 +1386,11 @@ static void outliner_add_collections_recursive(SpaceOops *soops, ListBase *tree, ten->name = collection->scene_collection->name; ten->directdata = collection; + for (LinkData *link = collection->object_bases.first; link; link = link->next) { + outliner_add_element(soops, &ten->subtree, ((Base *)link->data)->object, NULL, 0, 0); + } + outliner_make_hierarchy(&ten->subtree); + outliner_add_collections_recursive(soops, &ten->subtree, scene, &collection->layer_collections, ten); } } -- cgit v1.2.3