[Bf-blender-cvs] [428e07a9f77] blender2.8: Outliner: Draw nested collections before objects of a collection

[Julian Eisel]

Commit: 428e07a9f7719e3133ae7efdca1223697c17d812
Author: Julian Eisel
Date:   Wed Apr 12 14:47:54 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB428e07a9f7719e3133ae7efdca1223697c17d812

Outliner: Draw nested collections before objects of a collection

Collections may contain a huge list of objects, would be annoying having
to scroll over it all the time to get to the nested collections.

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

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 bb70a08e32d..60c2f107d20 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1368,12 +1368,11 @@ static void outliner_add_layer_collections_recursive(
 		ten->reinsert = outliner_layer_collections_reorder;
 		ten->reinsert_poll = outliner_layer_collections_reorder_poll;
 
+		outliner_add_layer_collections_recursive(soops, &ten->subtree, &collection->layer_collections, ten);
 		for (LinkData *link = collection->object_bases.first; link; link = link->next) {
 			outliner_add_element(soops, &ten->subtree, ((Base *)link->data)->object, ten, 0, 0);
 		}
 		outliner_make_hierarchy(&ten->subtree);
-
-		outliner_add_layer_collections_recursive(soops, &ten->subtree, &collection->layer_collections, ten);
 	}
 }
 static void outliner_add_collections_act_layer(SpaceOops *soops, SceneLayer *layer)
@@ -1447,15 +1446,15 @@ static void outliner_add_scene_collections_recursive(
 		ten->reinsert = outliner_scene_collections_reorder;
 		ten->reinsert_poll = outliner_scene_collections_reorder_poll;
 
-		outliner_add_scene_collection_objects(soops, &ten->subtree, collection, ten);
 		outliner_add_scene_collections_recursive(soops, &ten->subtree, &collection->scene_collections, ten);
+		outliner_add_scene_collection_objects(soops, &ten->subtree, collection, ten);
 	}
 }
 static void outliner_add_collections_master(SpaceOops *soops, Scene *scene)
 {
 	SceneCollection *master = BKE_collection_master(scene);
-	outliner_add_scene_collection_objects(soops, &soops->tree, master, NULL);
 	outliner_add_scene_collections_recursive(soops, &soops->tree, &master->scene_collections, NULL);
+	outliner_add_scene_collection_objects(soops, &soops->tree, master, NULL);
 }
 
 /* ======================================================= */