Depsgraph: cleanup DEGOIterObjectData > DEGObjectIterData

3 files changed, 18 insertions, 18 deletions

diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index c0269d2ba26..c782a91f76e 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -77,7 +77,7 @@ enum {
 	DEG_ITER_OBJECT_FLAG_DUPLI             = (1 << 4),
 };
 
-typedef struct DEGOIterObjectData {
+typedef struct DEGObjectIterData {
 	struct Depsgraph *graph;
 	struct Scene *scene;
 	struct EvaluationContext eval_ctx;
@@ -104,9 +104,9 @@ typedef struct DEGOIterObjectData {
 	/* **** Iteration ober ID nodes **** */
 	size_t id_node_index;
 	size_t num_id_nodes;
-} DEGOIterObjectData;
+} DEGObjectIterData;
 
-void DEG_iterator_objects_begin(struct BLI_Iterator *iter, DEGOIterObjectData *data);
+void DEG_iterator_objects_begin(struct BLI_Iterator *iter, DEGObjectIterData *data);
 void DEG_iterator_objects_next(struct BLI_Iterator *iter);
 void DEG_iterator_objects_end(struct BLI_Iterator *iter);
 
@@ -117,7 +117,7 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter);
  */
 #define DEG_OBJECT_ITER(graph_, instance_, flag_)                                 \
 	{                                                                             \
-		DEGOIterObjectData data_ = {                                              \
+		DEGObjectIterData data_ = {                                               \
 			.graph = (graph_),                                                    \
 			.flag = (flag_),                                                      \
 		};                                                                        \
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 9973018cc6e..a7f37575ff6 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -58,7 +58,7 @@ extern "C" {
 
 static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
 {
-	DEGOIterObjectData *data = (DEGOIterObjectData *)iter->data;
+	DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
 	while (data->dupli_object_next != NULL) {
 		DupliObject *dob = data->dupli_object_next;
 		Object *obd = dob->ob;
@@ -109,7 +109,7 @@ static void DEG_iterator_objects_step(BLI_Iterator *iter, DEG::IDDepsNode *id_no
 	/* Set it early in case we need to exit and we are running from within a loop. */
 	iter->skip = true;
 
-	DEGOIterObjectData *data = (DEGOIterObjectData *)iter->data;
+	DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
 	const ID_Type id_type = GS(id_node->id_orig->name);
 
 	if (id_type != ID_OB) {
@@ -153,7 +153,7 @@ static void DEG_iterator_objects_step(BLI_Iterator *iter, DEG::IDDepsNode *id_no
 	iter->skip = false;
 }
 
-void DEG_iterator_objects_begin(BLI_Iterator *iter, DEGOIterObjectData *data)
+void DEG_iterator_objects_begin(BLI_Iterator *iter, DEGObjectIterData *data)
 {
 	Depsgraph *depsgraph = data->graph;
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(depsgraph);
@@ -187,7 +187,7 @@ void DEG_iterator_objects_begin(BLI_Iterator *iter, DEGOIterObjectData *data)
 
 void DEG_iterator_objects_next(BLI_Iterator *iter)
 {
-	DEGOIterObjectData *data = (DEGOIterObjectData *)iter->data;
+	DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
 	Depsgraph *depsgraph = data->graph;
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(depsgraph);
 	do {
@@ -218,7 +218,7 @@ void DEG_iterator_objects_next(BLI_Iterator *iter)
 void DEG_iterator_objects_end(BLI_Iterator *iter)
 {
 #ifndef NDEBUG
-	DEGOIterObjectData *data = (DEGOIterObjectData *)iter->data;
+	DEGObjectIterData *data = (DEGObjectIterData *)iter->data;
 	/* Force crash in case the iterator data is referenced and accessed down the line. (T51718) */
 	memset(&data->temp_dupli_object, 0xff, sizeof(data->temp_dupli_object));
 #else
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index eb32a85afa7..ffa75dd75cb 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -61,7 +61,7 @@ static PointerRNA rna_DepsgraphIter_object_get(PointerRNA *ptr)
 static PointerRNA rna_DepsgraphIter_instance_object_get(PointerRNA *ptr)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	Object *instance_object = NULL;
 	if (deg_iter->dupli_object_current != NULL) {
 		instance_object = deg_iter->dupli_object_current->ob;
@@ -72,7 +72,7 @@ static PointerRNA rna_DepsgraphIter_instance_object_get(PointerRNA *ptr)
 static PointerRNA rna_DepsgraphIter_parent_get(PointerRNA *ptr)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	Object *dupli_parent = NULL;
 	if (deg_iter->dupli_object_current != NULL) {
 		dupli_parent = deg_iter->dupli_parent;
@@ -83,7 +83,7 @@ static PointerRNA rna_DepsgraphIter_parent_get(PointerRNA *ptr)
 static void rna_DepsgraphIter_persistent_id_get(PointerRNA *ptr, int *persistent_id)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	memcpy(persistent_id, deg_iter->dupli_object_current->persistent_id,
 	       sizeof(deg_iter->dupli_object_current->persistent_id));
 }
@@ -91,7 +91,7 @@ static void rna_DepsgraphIter_persistent_id_get(PointerRNA *ptr, int *persistent
 static void rna_DepsgraphIter_orco_get(PointerRNA *ptr, float *orco)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	memcpy(orco, deg_iter->dupli_object_current->orco,
 	       sizeof(deg_iter->dupli_object_current->orco));
 }
@@ -99,14 +99,14 @@ static void rna_DepsgraphIter_orco_get(PointerRNA *ptr, float *orco)
 static unsigned int rna_DepsgraphIter_random_id_get(PointerRNA *ptr)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	return deg_iter->dupli_object_current->random_id;
 }
 
 static void rna_DepsgraphIter_uv_get(PointerRNA *ptr, float *uv)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	memcpy(uv, deg_iter->dupli_object_current->uv,
 	       sizeof(deg_iter->dupli_object_current->uv));
 }
@@ -114,7 +114,7 @@ static void rna_DepsgraphIter_uv_get(PointerRNA *ptr, float *uv)
 static int rna_DepsgraphIter_is_instance_get(PointerRNA *ptr)
 {
 	BLI_Iterator *iterator = ptr->data;
-	DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data;
+	DEGObjectIterData *deg_iter = (DEGObjectIterData *)iterator->data;
 	return (deg_iter->dupli_object_current != NULL);
 }
 
@@ -149,7 +149,7 @@ static void rna_Depsgraph_debug_stats(Depsgraph *graph, char *result)
 static void rna_Depsgraph_objects_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	iter->internal.custom = MEM_callocN(sizeof(BLI_Iterator), __func__);
-	DEGOIterObjectData *data = MEM_callocN(sizeof(DEGOIterObjectData), __func__);
+	DEGObjectIterData *data = MEM_callocN(sizeof(DEGObjectIterData), __func__);
 
 	data->graph = (Depsgraph *)ptr->data;
 	data->flag = DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY |
@@ -188,7 +188,7 @@ static PointerRNA rna_Depsgraph_objects_get(CollectionPropertyIterator *iter)
 static void rna_Depsgraph_duplis_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
 {
 	iter->internal.custom = MEM_callocN(sizeof(BLI_Iterator), __func__);
-	DEGOIterObjectData *data = MEM_callocN(sizeof(DEGOIterObjectData), __func__);
+	DEGObjectIterData *data = MEM_callocN(sizeof(DEGObjectIterData), __func__);
 
 	data->graph = (Depsgraph *)ptr->data;
 	data->flag = DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY |