archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Rename BKE_layer_collection_active > BKE_layer_collection_get_active

Browse Source
This commit is contained in:
Dalai Felinto
2017-05-26 15:32:07 +02:00
parent 0ab9b943a2
commit 65a042b273
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/alembic/intern/alembic_capi.cc
View File

@@ -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 */

2
source/blender/blenkernel/BKE_layer.h
View File

@@ -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);

2
source/blender/blenkernel/intern/context.c
View File

@@ -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)

4
source/blender/blenkernel/intern/layer.c
View File

@@ -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));

2
source/blender/editors/space_buttons/buttons_context.c
View File

@@ -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]);

2
source/blender/makesrna/intern/rna_scene.c
View File

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