[Bf-blender-cvs] [0d0d68d39d] blender2.8: Outliner: Don't show master collection itself in "Master Collection Tree"

[Julian Eisel]

Commit: 0d0d68d39dad8e14b80489bc28d591fc6eff5f21
Author: Julian Eisel
Date:   Wed Mar 15 21:48:18 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB0d0d68d39dad8e14b80489bc28d591fc6eff5f21

Outliner: Don't show master collection itself in "Master Collection Tree"

It would always be the only highest-level element in the tree, without
serving a real purpose. Even collapsing it wouldn't make much sense.

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

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 81d85140a7..02ec8b314d 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1428,21 +1428,17 @@ static bool outliner_scene_collections_reorder_poll(
 	return true;
 }
 
-static void outliner_add_scene_collection_init(TreeElement *te, SceneCollection *collection)
-{
-	te->name = collection->name;
-	te->directdata = collection;
-	te->reinsert = outliner_scene_collections_reorder;
-	te->reinsert_poll = outliner_scene_collections_reorder_poll;
-}
-
 static void outliner_add_scene_collections_recursive(
         SpaceOops *soops, ListBase *tree, ListBase *scene_collections, TreeElement *parent_ten)
 {
 	for (SceneCollection *collection = scene_collections->first; collection; collection = collection->next) {
 		TreeElement *ten = outliner_add_element(soops, tree, collection, parent_ten, TSE_SCENE_COLLECTION, 0);
 
-		outliner_add_scene_collection_init(ten, collection);
+		ten->name = collection->name;
+		ten->directdata = collection;
+		ten->reinsert = outliner_scene_collections_reorder;
+		ten->reinsert_poll = outliner_scene_collections_reorder_poll;
+
 		for (LinkData *link = collection->objects.first; link; link = link->next) {
 			outliner_add_element(soops, &ten->subtree, link->data, ten, 0, 0);
 		}
@@ -1454,10 +1450,7 @@ static void outliner_add_scene_collections_recursive(
 static void outliner_add_collections_master(SpaceOops *soops, Scene *scene)
 {
 	SceneCollection *master = BKE_collection_master(scene);
-	TreeElement *ten = outliner_add_element(soops, &soops->tree, master, NULL, TSE_SCENE_COLLECTION, 0);
-
-	outliner_add_scene_collection_init(ten, master);
-	outliner_add_scene_collections_recursive(soops, &ten->subtree, &master->scene_collections, ten);
+	outliner_add_scene_collections_recursive(soops, &soops->tree, &master->scene_collections, NULL);
 }
 
 /* ======================================================= */