[Bf-blender-cvs] [5a10c64e8c] blender2.8: Layers: Show collection objects in Outliner

Dalai Felinto noreply at git.blender.org
Wed Feb 15 19:29:35 CET 2017


Commit: 5a10c64e8cc6525f24ce6ac05a2c7d50aa16fb8f
Author: Dalai Felinto
Date:   Wed Feb 15 19:08:23 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB5a10c64e8cc6525f24ce6ac05a2c7d50aa16fb8f

Layers: Show collection objects in Outliner

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

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 bbabb9e2d7..62ab69ebda 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);
 	}
 }




More information about the Bf-blender-cvs mailing list