diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-30 18:44:35 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-01 13:40:50 +0300 |
commit | 27a1bd445bc157d0798a1106573d750208de9d2f (patch) | |
tree | 3f2b9934e7a5ca2be70e30c024702f675a132e88 /source/blender/makesrna | |
parent | 2838a7646be89ebd64db886cfe6d3bc5275f6463 (diff) |
Depsgraph: Cleanup, naming
It makes more sense to stick to DEG_iterator_object order in name, since we can
have functions to iterate over different entities and we want all of them to
have common prefix.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_depsgraph.c | 34 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_layer.c | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c index 04c8352833e..7d520ec6abd 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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)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; - DEGObjectsIteratorData *deg_iter = (DEGObjectsIteratorData *)iterator->data; + DEGOIterObjectData *deg_iter = (DEGOIterObjectData *)iterator->data; return (deg_iter->dupli_object_current != NULL); } @@ -149,25 +149,25 @@ 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__); - DEGObjectsIteratorData *data = MEM_callocN(sizeof(DEGObjectsIteratorData), __func__); + DEGOIterObjectData *data = MEM_callocN(sizeof(DEGOIterObjectData), __func__); data->graph = (Depsgraph *)ptr->data; - data->flag = DEG_OBJECT_ITER_FLAG_SET; + data->flag = DEG_ITER_OBJECT_FLAG_SET; ((BLI_Iterator *)iter->internal.custom)->valid = true; - DEG_objects_iterator_begin(iter->internal.custom, data); + DEG_iterator_objects_begin(iter->internal.custom, data); iter->valid = ((BLI_Iterator *)iter->internal.custom)->valid; } static void rna_Depsgraph_objects_next(CollectionPropertyIterator *iter) { - DEG_objects_iterator_next(iter->internal.custom); + DEG_iterator_objects_next(iter->internal.custom); iter->valid = ((BLI_Iterator *)iter->internal.custom)->valid; } static void rna_Depsgraph_objects_end(CollectionPropertyIterator *iter) { - DEG_objects_iterator_end(iter->internal.custom); + DEG_iterator_objects_end(iter->internal.custom); MEM_freeN(((BLI_Iterator *)iter->internal.custom)->data); MEM_freeN(iter->internal.custom); } @@ -186,25 +186,25 @@ 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__); - DEGObjectsIteratorData *data = MEM_callocN(sizeof(DEGObjectsIteratorData), __func__); + DEGOIterObjectData *data = MEM_callocN(sizeof(DEGOIterObjectData), __func__); data->graph = (Depsgraph *)ptr->data; - data->flag = DEG_OBJECT_ITER_FLAG_ALL; + data->flag = DEG_ITER_OBJECT_FLAG_ALL; ((BLI_Iterator *)iter->internal.custom)->valid = true; - DEG_objects_iterator_begin(iter->internal.custom, data); + DEG_iterator_objects_begin(iter->internal.custom, data); iter->valid = ((BLI_Iterator *)iter->internal.custom)->valid; } static void rna_Depsgraph_duplis_next(CollectionPropertyIterator *iter) { - DEG_objects_iterator_next(iter->internal.custom); + DEG_iterator_objects_next(iter->internal.custom); iter->valid = ((BLI_Iterator *)iter->internal.custom)->valid; } static void rna_Depsgraph_duplis_end(CollectionPropertyIterator *iter) { - DEG_objects_iterator_end(iter->internal.custom); + DEG_iterator_objects_end(iter->internal.custom); MEM_freeN(((BLI_Iterator *)iter->internal.custom)->data); MEM_freeN(iter->internal.custom); } diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 4583774318b..2bdb3035073 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -863,7 +863,7 @@ static void rna_LayerObjects_selected_begin(CollectionPropertyIterator *iter, Po static void rna_ViewLayer_update_tagged(ViewLayer *UNUSED(view_layer), bContext *C) { Depsgraph *graph = CTX_data_depsgraph(C); - DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_ALL) + DEG_OBJECT_ITER(graph, ob, DEG_ITER_OBJECT_FLAG_ALL) { /* Don't do anything, we just need to run the iterator to flush * the base info to the objects. */ |