griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Julian Eisel
2017-03-15 21:48:18 +01:00
parent a449214854
commit 0d0d68d39d
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);
}
/* ======================================================= */