[Bf-blender-cvs] [c36eb9b2913] blender2.8: Rename Iterator struct to BLI_Iterator

Dalai Felinto noreply at git.blender.org
Thu May 18 17:35:06 CEST 2017 

Commit: c36eb9b291328a5345ad406a28435c97d5ac0155
Author: Dalai Felinto
Date:   Thu May 18 16:16:23 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc36eb9b291328a5345ad406a28435c97d5ac0155

Rename Iterator struct to BLI_Iterator

===================================================================

M	source/blender/blenkernel/BKE_collection.h
M	source/blender/blenkernel/BKE_layer.h
M	source/blender/blenkernel/intern/collection.c
M	source/blender/blenkernel/intern/layer.c
M	source/blender/blenlib/BLI_iterator.h
M	source/blender/depsgraph/DEG_depsgraph_query.h
M	source/blender/depsgraph/intern/depsgraph_query.cc
M	source/blender/makesrna/intern/rna_depsgraph.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_collection.h b/source/blender/blenkernel/BKE_collection.h
index 4111b9848bb..35d8f336207 100644
--- a/source/blender/blenkernel/BKE_collection.h
+++ b/source/blender/blenkernel/BKE_collection.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-struct Iterator;
+struct BLI_Iterator;
 struct SceneCollection;
 struct Object;
 struct Base;
@@ -67,13 +67,13 @@ 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 BLI_Iterator *iter, void *data_in);
+void BKE_scene_collections_iterator_next(struct BLI_Iterator *iter);
+void BKE_scene_collections_iterator_end(struct BLI_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 BLI_Iterator *iter, void *data_in);
+void BKE_scene_objects_iterator_next(struct BLI_Iterator *iter);
+void BKE_scene_objects_iterator_end(struct BLI_Iterator *iter);
 
 #define FOREACH_SCENE_COLLECTION(scene, _instance)                            \
 	ITER_BEGIN(BKE_scene_collections_iterator_begin,                          \
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index be4b40b90ff..decba7c2ace 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -156,21 +156,21 @@ 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(BLI_Iterator *iter, void *data_in);
+void BKE_selected_objects_iterator_next(BLI_Iterator *iter);
+void BKE_selected_objects_iterator_end(BLI_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(BLI_Iterator *iter, void *data_in);
+void BKE_visible_objects_iterator_next(BLI_Iterator *iter);
+void BKE_visible_objects_iterator_end(BLI_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(BLI_Iterator *iter, void *data_in);
+void BKE_selected_bases_iterator_next(BLI_Iterator *iter);
+void BKE_selected_bases_iterator_end(BLI_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(BLI_Iterator *iter, void *data_in);
+void BKE_visible_bases_iterator_next(BLI_Iterator *iter);
+void BKE_visible_bases_iterator_end(BLI_Iterator *iter);
 
 #define FOREACH_SELECTED_OBJECT(sl, _instance)                                \
 	ITER_BEGIN(BKE_selected_objects_iterator_begin,                           \
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index 992c5d706a6..7d265b8fd02 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(BLI_Iterator *iter, void *data_in)
 {
 	Scene *scene = data_in;
 	SceneCollectionsIteratorData *data = MEM_callocN(sizeof(SceneCollectionsIteratorData), __func__);
@@ -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 BLI_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 BLI_Iterator *iter)
 {
 	SceneCollectionsIteratorData *data = iter->data;
 
@@ -555,10 +555,10 @@ void BKE_scene_collections_iterator_end(struct Iterator *iter)
 typedef struct SceneObjectsIteratorData {
 	GSet *visited;
 	LinkData *link;
-	Iterator scene_collection_iter;
+	BLI_Iterator scene_collection_iter;
 } SceneObjectsIteratorData;
 
-void BKE_scene_objects_iterator_begin(Iterator *iter, void *data_in)
+void BKE_scene_objects_iterator_begin(BLI_Iterator *iter, void *data_in)
 {
 	Scene *scene = data_in;
 	SceneObjectsIteratorData *data = MEM_callocN(sizeof(SceneObjectsIteratorData), __func__);
@@ -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(BLI_Iterator *iter)
 {
 	SceneObjectsIteratorData *data = iter->data;
 	LinkData *link = data->link ? object_base_unique(data->visited, data->link->next) : NULL;
@@ -629,7 +629,7 @@ void BKE_scene_objects_iterator_next(Iterator *iter)
 	}
 }
 
-void BKE_scene_objects_iterator_end(Iterator *iter)
+void BKE_scene_objects_iterator_end(BLI_Iterator *iter)
 {
 	SceneObjectsIteratorData *data = iter->data;
 	if (data) {
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index fddffa63a59..111408a01af 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -60,7 +60,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(Iterator *iter, const int flag);
+static void object_bases_Iterator_next(BLI_Iterator *iter, const int flag);
 
 /* RenderLayer */
 
@@ -1586,7 +1586,7 @@ void BKE_scene_layer_engine_settings_validate_layer(SceneLayer *sl)
 /* ---------------------------------------------------------------------- */
 /* Iterators */
 
-static void object_bases_Iterator_begin(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;
@@ -1608,7 +1608,7 @@ static void object_bases_Iterator_begin(Iterator *iter, void *data_in, const int
 	}
 }
 
-static void object_bases_Iterator_next(Iterator *iter, const int flag)
+static void object_bases_Iterator_next(BLI_Iterator *iter, const int flag)
 {
 	Base *base = ((Base *)iter->data)->next;
 
@@ -1625,7 +1625,7 @@ static void object_bases_Iterator_next(Iterator *iter, const int flag)
 	iter->valid = false;
 }
 
-static void objects_Iterator_begin(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);
 
@@ -1634,7 +1634,7 @@ static void objects_Iterator_begin(Iterator *iter, void *data_in, const int flag
 	}
 }
 
-static void objects_Iterator_next(Iterator *iter, const int flag)
+static void objects_Iterator_next(BLI_Iterator *iter, const int flag)
 {
 	object_bases_Iterator_next(iter, flag);
 
@@ -1643,62 +1643,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(BLI_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(BLI_Iterator *iter)
 {
 	objects_Iterator_next(iter, BASE_SELECTED);
 }
 
-void BKE_selected_objects_iterator_end(Iterator *UNUSED(iter))
+void BKE_selected_objects_iterator_end(BLI_Iterator *UNUSED(iter))
 {
 	/* do nothing */
 }
 
-void BKE_visible_objects_iterator_begin(Iterator *iter, void *data_in)
+void BKE_visible_objects_iterator_begin(BLI_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(BLI_Iterator *iter)
 {
 	objects_Iterator_next(iter, BASE_VISIBLED);
 }
 
-void BKE_visible_objects_iterator_end(Iterator *UNUSED(iter))
+void BKE_visible_objects_iterator_end(BLI_Iterator *UNUSED(iter))
 {
 	/* do nothing */
 }
 
-void BKE_selected_bases_iterator_begin(Iterator *iter, void *data_in)
+void BKE_selected_bases_iterator_begin(BLI_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(BLI_Iterator *iter)
 {
 	object_bases_Iterator_next(iter, BASE_SELECTED);
 }
 
-void BKE_selected_bases_iterator_end(Iterator *UNUSED(iter))
+void BKE_selected_bases_iterator_end(BLI_Iterator *UNUSED(iter))
 {
 	/* do nothing */
 }
 
-void BKE_visible_bases_iterator_begin(Iterator *iter, void *data_in)
+void BKE_visible_bases_iterator_begin(BLI_Iterator *iter, void *data_in)
 {
 	object_bases_Iterator_begin(iter, data_in, BASE_VISIBLED);
 }
 
-void BKE_visible_bases_iterator_next(It

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list