Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Outliner: Draw nested collections before objects of a collection

Browse Source 
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.
This commit is contained in:
Julian Eisel
2017-04-12 14:47:54 +02:00
parent 64905c4c77
commit 428e07a9f7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_outliner/outliner_tree.c
View File

@@ -1368,12 +1368,11 @@ static void outliner_add_layer_collections_recursive(
ten->reinsert = outliner_layer_collections_reorder; ten->reinsert = outliner_layer_collections_reorder;
ten->reinsert_poll = outliner_layer_collections_reorder_poll; 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) { 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_add_element(soops, &ten->subtree, ((Base *)link->data)->object, ten, 0, 0);
} }
outliner_make_hierarchy(&ten->subtree); 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) 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 = outliner_scene_collections_reorder;
ten->reinsert_poll = outliner_scene_collections_reorder_poll; 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_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) static void outliner_add_collections_master(SpaceOops *soops, Scene *scene)
{ {
SceneCollection *master = BKE_collection_master(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_collections_recursive(soops, &soops->tree, &master->scene_collections, NULL);
outliner_add_scene_collection_objects(soops, &soops->tree, master, NULL);
} }
/* ======================================================= */ /* ======================================================= */