[Bf-blender-cvs] [193a1df8fa8] blender2.8: Renaming: *_Iterator_begin/next > *_iterator_begin/next
Dalai Felinto
noreply at git.blender.org
Mon Jun 12 18:37:34 CEST 2017
Commit: 193a1df8fa8d06059949715d9d71c9bfd2ddf82e
Author: Dalai Felinto
Date: Mon Jun 12 18:19:23 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB193a1df8fa8d06059949715d9d71c9bfd2ddf82e
Renaming: *_Iterator_begin/next > *_iterator_begin/next
===================================================================
M source/blender/blenkernel/intern/layer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index d600f753d75..f9c9f218628 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -62,7 +62,7 @@ static IDProperty *collection_engine_settings_create(struct EngineSettingsCB_Typ
static IDProperty *collection_engine_get(IDProperty *root, const int type, const char *engine_name);
static void collection_engine_settings_init(IDProperty *root, const bool populate);
static void layer_engine_settings_init(IDProperty *root, const bool populate);
-static void object_bases_Iterator_next(BLI_Iterator *iter, const int flag);
+static void object_bases_iterator_next(BLI_Iterator *iter, const int flag);
/* RenderLayer */
@@ -1599,7 +1599,7 @@ void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl)
/* ---------------------------------------------------------------------- */
/* Iterators */
-static void object_bases_Iterator_begin(BLI_Iterator *iter, void *data_in, const int flag)
+static void object_bases_iterator_begin(BLI_Iterator *iter, void *data_in, const int flag)
{
SceneLayer *sl = data_in;
Base *base = sl->object_bases.first;
@@ -1614,14 +1614,14 @@ static void object_bases_Iterator_begin(BLI_Iterator *iter, void *data_in, const
iter->data = base;
if ((base->flag & flag) == 0) {
- object_bases_Iterator_next(iter, flag);
+ object_bases_iterator_next(iter, flag);
}
else {
iter->current = base;
}
}
-static void object_bases_Iterator_next(BLI_Iterator *iter, const int flag)
+static void object_bases_iterator_next(BLI_Iterator *iter, const int flag)
{
Base *base = ((Base *)iter->data)->next;
@@ -1638,18 +1638,18 @@ static void object_bases_Iterator_next(BLI_Iterator *iter, const int flag)
iter->valid = false;
}
-static void objects_Iterator_begin(BLI_Iterator *iter, void *data_in, const int flag)
+static void objects_iterator_begin(BLI_Iterator *iter, void *data_in, const int flag)
{
- object_bases_Iterator_begin(iter, data_in, flag);
+ object_bases_iterator_begin(iter, data_in, flag);
if (iter->valid) {
iter->current = ((Base *)iter->current)->object;
}
}
-static void objects_Iterator_next(BLI_Iterator *iter, const int flag)
+static void objects_iterator_next(BLI_Iterator *iter, const int flag)
{
- object_bases_Iterator_next(iter, flag);
+ object_bases_iterator_next(iter, flag);
if (iter->valid) {
iter->current = ((Base *)iter->current)->object;
@@ -1658,12 +1658,12 @@ static void objects_Iterator_next(BLI_Iterator *iter, const int flag)
void BKE_selected_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
{
- objects_Iterator_begin(iter, data_in, BASE_SELECTED);
+ objects_iterator_begin(iter, data_in, BASE_SELECTED);
}
void BKE_selected_objects_iterator_next(BLI_Iterator *iter)
{
- objects_Iterator_next(iter, BASE_SELECTED);
+ objects_iterator_next(iter, BASE_SELECTED);
}
void BKE_selected_objects_iterator_end(BLI_Iterator *UNUSED(iter))
@@ -1673,12 +1673,12 @@ void BKE_selected_objects_iterator_end(BLI_Iterator *UNUSED(iter))
void BKE_visible_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
{
- objects_Iterator_begin(iter, data_in, BASE_VISIBLED);
+ objects_iterator_begin(iter, data_in, BASE_VISIBLED);
}
void BKE_visible_objects_iterator_next(BLI_Iterator *iter)
{
- objects_Iterator_next(iter, BASE_VISIBLED);
+ objects_iterator_next(iter, BASE_VISIBLED);
}
void BKE_visible_objects_iterator_end(BLI_Iterator *UNUSED(iter))
@@ -1688,12 +1688,12 @@ void BKE_visible_objects_iterator_end(BLI_Iterator *UNUSED(iter))
void BKE_selected_bases_iterator_begin(BLI_Iterator *iter, void *data_in)
{
- object_bases_Iterator_begin(iter, data_in, BASE_SELECTED);
+ object_bases_iterator_begin(iter, data_in, BASE_SELECTED);
}
void BKE_selected_bases_iterator_next(BLI_Iterator *iter)
{
- object_bases_Iterator_next(iter, BASE_SELECTED);
+ object_bases_iterator_next(iter, BASE_SELECTED);
}
void BKE_selected_bases_iterator_end(BLI_Iterator *UNUSED(iter))
@@ -1703,12 +1703,12 @@ void BKE_selected_bases_iterator_end(BLI_Iterator *UNUSED(iter))
void BKE_visible_bases_iterator_begin(BLI_Iterator *iter, void *data_in)
{
- object_bases_Iterator_begin(iter, data_in, BASE_VISIBLED);
+ object_bases_iterator_begin(iter, data_in, BASE_VISIBLED);
}
void BKE_visible_bases_iterator_next(BLI_Iterator *iter)
{
- object_bases_Iterator_next(iter, BASE_VISIBLED);
+ object_bases_iterator_next(iter, BASE_VISIBLED);
}
void BKE_visible_bases_iterator_end(BLI_Iterator *UNUSED(iter))
More information about the Bf-blender-cvs
mailing list