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

Outliner: Fix objects of master collection not showing up in 'Master Collection Tree'

Browse Source
This commit is contained in:
Julian Eisel
2017-04-12 14:45:42 +02:00
parent af2fc7b637
commit 64905c4c77
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1427,6 +1427,15 @@ static bool outliner_scene_collections_reorder_poll(
return true; return true;
} }
static void outliner_add_scene_collection_objects(
SpaceOops *soops, ListBase *tree, SceneCollection *collection, TreeElement *parent)
{
for (LinkData *link = collection->objects.first; link; link = link->next) {
outliner_add_element(soops, tree, link->data, parent, 0, 0);
}
outliner_make_hierarchy(tree);
}
static void outliner_add_scene_collections_recursive( static void outliner_add_scene_collections_recursive(
SpaceOops *soops, ListBase *tree, ListBase *scene_collections, TreeElement *parent_ten) SpaceOops *soops, ListBase *tree, ListBase *scene_collections, TreeElement *parent_ten)
{ {
@@ -1438,17 +1447,14 @@ 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;
for (LinkData *link = collection->objects.first; link; link = link->next) { outliner_add_scene_collection_objects(soops, &ten->subtree, collection, ten);
outliner_add_element(soops, &ten->subtree, link->data, ten, 0, 0);
}
outliner_make_hierarchy(&ten->subtree);
outliner_add_scene_collections_recursive(soops, &ten->subtree, &collection->scene_collections, ten); outliner_add_scene_collections_recursive(soops, &ten->subtree, &collection->scene_collections, 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);
} }