diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-26 16:32:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-26 18:44:00 +0300 |
| commit | 65a042b27324a7345ce415cf77c75e3220ada92d (patch) | |
| tree | fbffcd1395d3a66e571927f3072340a25f3e0e26 /source/blender/blenkernel | |
| parent | 0ab9b943a2aae617d36a4010bb60d3cbe8bd5d57 (diff) | |
Rename BKE_layer_collection_active > BKE_layer_collection_get_active
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/layer.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 55b9f25a59c..c6ec7e9df25 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -78,7 +78,7 @@ void BKE_scene_layer_base_select(struct SceneLayer *sl, struct Base *selbase); void BKE_layer_collection_free(struct SceneLayer *sl, struct LayerCollection *lc); -struct LayerCollection *BKE_layer_collection_active(struct SceneLayer *sl); +struct LayerCollection *BKE_layer_collection_get_active(struct SceneLayer *sl); struct LayerCollection *BKE_layer_collection_get_active_ensure(struct Scene *scene, struct SceneLayer *sl); int BKE_layer_collection_count(struct SceneLayer *sl); diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 3c2f641fb42..ec0e14d814f 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -931,7 +931,7 @@ LayerCollection *CTX_data_layer_collection(const bContext *C) } /* fallback */ - return BKE_layer_collection_active(sl); + return BKE_layer_collection_get_active(sl); } SceneCollection *CTX_data_scene_collection(const bContext *C) diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 77545016c57..c0211c53021 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -364,7 +364,7 @@ static LayerCollection *collection_from_index(ListBase *lb, const int number, in /** * Get the active collection */ -LayerCollection *BKE_layer_collection_active(SceneLayer *sl) +LayerCollection *BKE_layer_collection_get_active(SceneLayer *sl) { int i = 0; return collection_from_index(&sl->layer_collections, sl->active_collection, &i); @@ -377,7 +377,7 @@ LayerCollection *BKE_layer_collection_active(SceneLayer *sl) */ LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, SceneLayer *sl) { - LayerCollection *lc = BKE_layer_collection_active(sl); + LayerCollection *lc = BKE_layer_collection_get_active(sl); if (lc == NULL) { BLI_assert(BLI_listbase_is_empty(&sl->layer_collections)); |