diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-09-02 15:31:19 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-09-02 19:39:08 +0300 |
commit | 3850557073a156fed94455eb3d7a9b3aad340880 (patch) | |
tree | b24e1df23251f7e23e63e7f7a7dafdb930b73a3b /source/blender/editors/space_outliner/outliner_collections.c | |
parent | 0ebc76354f8d3bc2bd346a3736f865f6f7faf6e7 (diff) |
Cleanup: get rid of BKE_collection_master() useless accessor.
In its current version that was a totally useless extra layer of crap
that we can totally avoid. Plus name was bad too.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_collections.c')
-rw-r--r-- | source/blender/editors/space_outliner/outliner_collections.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_outliner/outliner_collections.c b/source/blender/editors/space_outliner/outliner_collections.c index 4740c412083..309446db83b 100644 --- a/source/blender/editors/space_outliner/outliner_collections.c +++ b/source/blender/editors/space_outliner/outliner_collections.c @@ -89,7 +89,7 @@ Collection *outliner_collection_from_tree_element(const TreeElement *te) } else if (ELEM(tselem->type, TSE_SCENE_COLLECTION_BASE, TSE_VIEW_COLLECTION_BASE)) { Scene *scene = (Scene *)tselem->id; - return BKE_collection_master(scene); + return scene->master_collection; } else if (tselem->type == 0 && te->idcode == ID_GR) { return (Collection *)tselem->id; @@ -199,7 +199,7 @@ static int collection_new_exec(bContext *C, wmOperator *op) } if (data.collection == NULL || ID_IS_LINKED(data.collection)) { - data.collection = BKE_collection_master(scene); + data.collection = scene->master_collection; } if (ID_IS_LINKED(scene)) { @@ -514,14 +514,14 @@ static int collection_duplicate_exec(bContext *C, wmOperator *op) * This can happen when a whole scene is linked e.g. */ if (parent != NULL && ID_IS_LINKED(parent)) { Scene *scene = CTX_data_scene(C); - parent = ID_IS_LINKED(scene) ? NULL : BKE_collection_master(scene); + parent = ID_IS_LINKED(scene) ? NULL : scene->master_collection; } else if (parent != NULL && (parent->flag & COLLECTION_IS_MASTER) != 0) { Scene *scene = BKE_collection_master_scene_search(bmain, parent); BLI_assert(scene != NULL); if (ID_IS_LINKED(scene)) { scene = CTX_data_scene(C); - parent = ID_IS_LINKED(scene) ? NULL : BKE_collection_master(scene); + parent = ID_IS_LINKED(scene) ? NULL : scene->master_collection; } } |