diff options
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 2 | ||||
-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 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index ac195ffc955..cfff13ec77e 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -830,7 +830,7 @@ static void import_endjob(void *user_data) BKE_scene_layer_base_deselect_all(sl); - lc = BKE_layer_collection_active(sl); + lc = BKE_layer_collection_get_active(sl); if (lc == NULL) { BLI_assert(BLI_listbase_count_ex(&sl->layer_collections, 1) == 0); /* when there is no collection linked to this SceneLayer, create one */ 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)); diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index f6e0d7100e9..1f59007d3b4 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -568,7 +568,7 @@ static int buttons_context_path_collection(const bContext *C, ButsContextPath *p } SceneLayer *sl = CTX_data_scene_layer(C); - LayerCollection *sc = BKE_layer_collection_active(sl); + LayerCollection *sc = BKE_layer_collection_get_active(sl); if (sc) { RNA_pointer_create(NULL, &RNA_LayerCollection, sc, &path->ptr[path->len]); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 95a2f86e080..962bf8cc997 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2856,7 +2856,7 @@ static void rna_LayerCollections_active_collection_index_range( static PointerRNA rna_LayerCollections_active_collection_get(PointerRNA *ptr) { SceneLayer *sl = (SceneLayer *)ptr->data; - LayerCollection *lc = BKE_layer_collection_active(sl); + LayerCollection *lc = BKE_layer_collection_get_active(sl); return rna_pointer_inherit_refine(ptr, &RNA_LayerCollection, lc); } |