diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-04-24 19:14:41 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-04-24 19:14:41 +0300 |
commit | 9f074444ad8b96ea979b435aaed89a32610e4f0d (patch) | |
tree | 655004b42134204d7ff0bb3e8f1353ffa8678f18 /source/blender/blenkernel | |
parent | 9b94e2a743cf6b059f5e62fbb34605bc1f3117f1 (diff) |
Layer cleanup: Rename _Iterator_ > _iterator_
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_collection.h | 24 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 60 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 22 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 24 |
4 files changed, 65 insertions, 65 deletions
diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h index 17acba78ffa..4111b9848bb 100644 --- a/source/blender/blenkernel/BKE_collection.h +++ b/source/blender/blenkernel/BKE_collection.h @@ -67,27 +67,27 @@ void BKE_scene_collections_callback(struct Scene *scene, BKE_scene_collections_C void BKE_scene_objects_callback(struct Scene *scene, BKE_scene_objects_Cb callback, void *data); /* iterators */ -void BKE_scene_collections_Iterator_begin(struct Iterator *iter, void *data_in); -void BKE_scene_collections_Iterator_next(struct Iterator *iter); -void BKE_scene_collections_Iterator_end(struct Iterator *iter); +void BKE_scene_collections_iterator_begin(struct Iterator *iter, void *data_in); +void BKE_scene_collections_iterator_next(struct Iterator *iter); +void BKE_scene_collections_iterator_end(struct Iterator *iter); -void BKE_scene_objects_Iterator_begin(struct Iterator *iter, void *data_in); -void BKE_scene_objects_Iterator_next(struct Iterator *iter); -void BKE_scene_objects_Iterator_end(struct Iterator *iter); +void BKE_scene_objects_iterator_begin(struct Iterator *iter, void *data_in); +void BKE_scene_objects_iterator_next(struct Iterator *iter); +void BKE_scene_objects_iterator_end(struct Iterator *iter); #define FOREACH_SCENE_COLLECTION(scene, _instance) \ - ITER_BEGIN(BKE_scene_collections_Iterator_begin, \ - BKE_scene_collections_Iterator_next, \ - BKE_scene_collections_Iterator_end, \ + ITER_BEGIN(BKE_scene_collections_iterator_begin, \ + BKE_scene_collections_iterator_next, \ + BKE_scene_collections_iterator_end, \ scene, SceneCollection *, _instance) #define FOREACH_SCENE_COLLECTION_END \ ITER_END #define FOREACH_SCENE_OBJECT(scene, _instance) \ - ITER_BEGIN(BKE_scene_objects_Iterator_begin, \ - BKE_scene_objects_Iterator_next, \ - BKE_scene_objects_Iterator_end, \ + ITER_BEGIN(BKE_scene_objects_iterator_begin, \ + BKE_scene_objects_iterator_next, \ + BKE_scene_objects_iterator_end, \ scene, Object *, _instance) #define FOREACH_SCENE_OBJECT_END \ diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 8ce5c6387a5..c75f9fb818d 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -138,53 +138,53 @@ void BKE_layer_eval_layer_collection_post(struct EvaluationContext *eval_ctx, /* iterators */ -void BKE_selected_objects_Iterator_begin(Iterator *iter, void *data_in); -void BKE_selected_objects_Iterator_next(Iterator *iter); -void BKE_selected_objects_Iterator_end(Iterator *iter); +void BKE_selected_objects_iterator_begin(Iterator *iter, void *data_in); +void BKE_selected_objects_iterator_next(Iterator *iter); +void BKE_selected_objects_iterator_end(Iterator *iter); -void BKE_visible_objects_Iterator_begin(Iterator *iter, void *data_in); -void BKE_visible_objects_Iterator_next(Iterator *iter); -void BKE_visible_objects_Iterator_end(Iterator *iter); +void BKE_visible_objects_iterator_begin(Iterator *iter, void *data_in); +void BKE_visible_objects_iterator_next(Iterator *iter); +void BKE_visible_objects_iterator_end(Iterator *iter); -void BKE_selected_bases_Iterator_begin(Iterator *iter, void *data_in); -void BKE_selected_bases_Iterator_next(Iterator *iter); -void BKE_selected_bases_Iterator_end(Iterator *iter); +void BKE_selected_bases_iterator_begin(Iterator *iter, void *data_in); +void BKE_selected_bases_iterator_next(Iterator *iter); +void BKE_selected_bases_iterator_end(Iterator *iter); -void BKE_visible_bases_Iterator_begin(Iterator *iter, void *data_in); -void BKE_visible_bases_Iterator_next(Iterator *iter); -void BKE_visible_bases_Iterator_end(Iterator *iter); +void BKE_visible_bases_iterator_begin(Iterator *iter, void *data_in); +void BKE_visible_bases_iterator_next(Iterator *iter); +void BKE_visible_bases_iterator_end(Iterator *iter); #define FOREACH_SELECTED_OBJECT(sl, _instance) \ - ITER_BEGIN(BKE_selected_objects_Iterator_begin, \ - BKE_selected_objects_Iterator_next, \ - BKE_selected_objects_Iterator_end, \ + ITER_BEGIN(BKE_selected_objects_iterator_begin, \ + BKE_selected_objects_iterator_next, \ + BKE_selected_objects_iterator_end, \ sl, Object *, _instance) #define FOREACH_SELECTED_OBJECT_END \ ITER_END #define FOREACH_VISIBLE_OBJECT(sl, _instance) \ - ITER_BEGIN(BKE_visible_objects_Iterator_begin, \ - BKE_visible_objects_Iterator_next, \ - BKE_visible_objects_Iterator_end, \ + ITER_BEGIN(BKE_visible_objects_iterator_begin, \ + BKE_visible_objects_iterator_next, \ + BKE_visible_objects_iterator_end, \ sl, Object *, _instance) #define FOREACH_VISIBLE_OBJECT_END \ ITER_END #define FOREACH_SELECTED_BASE(sl, _instance) \ - ITER_BEGIN(BKE_selected_bases_Iterator_begin, \ - BKE_selected_bases_Iterator_next, \ - BKE_selected_bases_Iterator_end, \ + ITER_BEGIN(BKE_selected_bases_iterator_begin, \ + BKE_selected_bases_iterator_next, \ + BKE_selected_bases_iterator_end, \ sl, Base *, _instance) #define FOREACH_SELECTED_BASE_END \ ITER_END #define FOREACH_VISIBLE_BASE(sl, _instance) \ - ITER_BEGIN(BKE_visible_bases_Iterator_begin, \ - BKE_visible_bases_Iterator_next, \ - BKE_visible_bases_Iterator_end, \ + ITER_BEGIN(BKE_visible_bases_iterator_begin, \ + BKE_visible_bases_iterator_next, \ + BKE_visible_bases_iterator_end, \ sl, Base *, _instance) #define FOREACH_VISIBLE_BASE_END \ @@ -209,15 +209,15 @@ void BKE_visible_bases_Iterator_end(Iterator *iter); void *data_in; \ \ if (flag == SELECT) { \ - func_begin = &BKE_selected_objects_Iterator_begin; \ - func_next = &BKE_selected_objects_Iterator_next; \ - func_end = &BKE_selected_objects_Iterator_end; \ + func_begin = &BKE_selected_objects_iterator_begin; \ + func_next = &BKE_selected_objects_iterator_next; \ + func_end = &BKE_selected_objects_iterator_end; \ data_in = (sl); \ } \ else { \ - func_begin = BKE_scene_objects_Iterator_begin; \ - func_next = BKE_scene_objects_Iterator_next; \ - func_end = BKE_scene_objects_Iterator_end; \ + func_begin = BKE_scene_objects_iterator_begin; \ + func_next = BKE_scene_objects_iterator_next; \ + func_end = BKE_scene_objects_iterator_end; \ data_in = (scene); \ } \ ITER_BEGIN(func_begin, func_next, func_end, data_in, Object *, _instance) diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index b16162dfbc0..9739bbad09b 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -508,7 +508,7 @@ static void scene_collections_array(Scene *scene, SceneCollection ***collections * Only use this in non-performance critical situations * (it iterates over all scene collections twice) */ -void BKE_scene_collections_Iterator_begin(Iterator *iter, void *data_in) +void BKE_scene_collections_iterator_begin(Iterator *iter, void *data_in) { Scene *scene = data_in; SceneCollectionsIteratorData *data = MEM_callocN(sizeof(SceneCollectionsIteratorData), __FUNCTION__); @@ -524,7 +524,7 @@ void BKE_scene_collections_Iterator_begin(Iterator *iter, void *data_in) iter->valid = true; } -void BKE_scene_collections_Iterator_next(struct Iterator *iter) +void BKE_scene_collections_iterator_next(struct Iterator *iter) { SceneCollectionsIteratorData *data = iter->data; @@ -536,7 +536,7 @@ void BKE_scene_collections_Iterator_next(struct Iterator *iter) } } -void BKE_scene_collections_Iterator_end(struct Iterator *iter) +void BKE_scene_collections_iterator_end(struct Iterator *iter) { SceneCollectionsIteratorData *data = iter->data; @@ -558,7 +558,7 @@ typedef struct SceneObjectsIteratorData { Iterator scene_collection_iter; } SceneObjectsIteratorData; -void BKE_scene_objects_Iterator_begin(Iterator *iter, void *data_in) +void BKE_scene_objects_iterator_begin(Iterator *iter, void *data_in) { Scene *scene = data_in; SceneObjectsIteratorData *data = MEM_callocN(sizeof(SceneObjectsIteratorData), __FUNCTION__); @@ -568,14 +568,14 @@ void BKE_scene_objects_Iterator_begin(Iterator *iter, void *data_in) data->visited = BLI_gset_ptr_new(__func__); /* we wrap the scenecollection iterator here to go over the scene collections */ - BKE_scene_collections_Iterator_begin(&data->scene_collection_iter, scene); + BKE_scene_collections_iterator_begin(&data->scene_collection_iter, scene); SceneCollection *sc = data->scene_collection_iter.current; iter->current = sc->objects.first ? ((LinkData *)sc->objects.first)->data : NULL; iter->valid = true; if (iter->current == NULL) { - BKE_scene_objects_Iterator_next(iter); + BKE_scene_objects_iterator_next(iter); } } @@ -598,7 +598,7 @@ static LinkData *object_base_unique(GSet *gs, LinkData *link) } } -void BKE_scene_objects_Iterator_next(Iterator *iter) +void BKE_scene_objects_iterator_next(Iterator *iter) { SceneObjectsIteratorData *data = iter->data; LinkData *link = data->link ? object_base_unique(data->visited, data->link->next) : NULL; @@ -610,7 +610,7 @@ void BKE_scene_objects_Iterator_next(Iterator *iter) else { /* if this is the last object of this ListBase look at the next SceneCollection */ SceneCollection *sc; - BKE_scene_collections_Iterator_next(&data->scene_collection_iter); + BKE_scene_collections_iterator_next(&data->scene_collection_iter); do { sc = data->scene_collection_iter.current; /* get the first unique object of this collection */ @@ -620,7 +620,7 @@ void BKE_scene_objects_Iterator_next(Iterator *iter) iter->current = data->link->data; return; } - BKE_scene_collections_Iterator_next(&data->scene_collection_iter); + BKE_scene_collections_iterator_next(&data->scene_collection_iter); } while (data->scene_collection_iter.valid); if (!data->scene_collection_iter.valid) { @@ -629,11 +629,11 @@ void BKE_scene_objects_Iterator_next(Iterator *iter) } } -void BKE_scene_objects_Iterator_end(Iterator *iter) +void BKE_scene_objects_iterator_end(Iterator *iter) { SceneObjectsIteratorData *data = iter->data; if (data) { - BKE_scene_collections_Iterator_end(&data->scene_collection_iter); + BKE_scene_collections_iterator_end(&data->scene_collection_iter); BLI_gset_free(data->visited, NULL); MEM_freeN(data); } diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index c25b6b686cd..6442c53635d 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -1313,62 +1313,62 @@ static void objects_Iterator_next(Iterator *iter, const int flag) } } -void BKE_selected_objects_Iterator_begin(Iterator *iter, void *data_in) +void BKE_selected_objects_iterator_begin(Iterator *iter, void *data_in) { objects_Iterator_begin(iter, data_in, BASE_SELECTED); } -void BKE_selected_objects_Iterator_next(Iterator *iter) +void BKE_selected_objects_iterator_next(Iterator *iter) { objects_Iterator_next(iter, BASE_SELECTED); } -void BKE_selected_objects_Iterator_end(Iterator *UNUSED(iter)) +void BKE_selected_objects_iterator_end(Iterator *UNUSED(iter)) { /* do nothing */ } -void BKE_visible_objects_Iterator_begin(Iterator *iter, void *data_in) +void BKE_visible_objects_iterator_begin(Iterator *iter, void *data_in) { objects_Iterator_begin(iter, data_in, BASE_VISIBLED); } -void BKE_visible_objects_Iterator_next(Iterator *iter) +void BKE_visible_objects_iterator_next(Iterator *iter) { objects_Iterator_next(iter, BASE_VISIBLED); } -void BKE_visible_objects_Iterator_end(Iterator *UNUSED(iter)) +void BKE_visible_objects_iterator_end(Iterator *UNUSED(iter)) { /* do nothing */ } -void BKE_selected_bases_Iterator_begin(Iterator *iter, void *data_in) +void BKE_selected_bases_iterator_begin(Iterator *iter, void *data_in) { object_bases_Iterator_begin(iter, data_in, BASE_SELECTED); } -void BKE_selected_bases_Iterator_next(Iterator *iter) +void BKE_selected_bases_iterator_next(Iterator *iter) { object_bases_Iterator_next(iter, BASE_SELECTED); } -void BKE_selected_bases_Iterator_end(Iterator *UNUSED(iter)) +void BKE_selected_bases_iterator_end(Iterator *UNUSED(iter)) { /* do nothing */ } -void BKE_visible_bases_Iterator_begin(Iterator *iter, void *data_in) +void BKE_visible_bases_iterator_begin(Iterator *iter, void *data_in) { object_bases_Iterator_begin(iter, data_in, BASE_VISIBLED); } -void BKE_visible_bases_Iterator_next(Iterator *iter) +void BKE_visible_bases_iterator_next(Iterator *iter) { object_bases_Iterator_next(iter, BASE_VISIBLED); } -void BKE_visible_bases_Iterator_end(Iterator *UNUSED(iter)) +void BKE_visible_bases_iterator_end(Iterator *UNUSED(iter)) { /* do nothing */ } |