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/depsgraph/DEG_depsgraph_query.h | |
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/depsgraph/DEG_depsgraph_query.h')
-rw-r--r-- | source/blender/depsgraph/DEG_depsgraph_query.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index 36d44a06eac..dd7d6182081 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -70,13 +70,13 @@ struct ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, struct ID *id); /* ************************ DAG iterators ********************* */ enum { - DEG_OBJECT_ITER_FLAG_SET = (1 << 0), - DEG_OBJECT_ITER_FLAG_DUPLI = (1 << 1), + DEG_ITER_OBJECT_FLAG_SET = (1 << 0), + DEG_ITER_OBJECT_FLAG_DUPLI = (1 << 1), }; -#define DEG_OBJECT_ITER_FLAG_ALL (DEG_OBJECT_ITER_FLAG_SET | DEG_OBJECT_ITER_FLAG_DUPLI) +#define DEG_ITER_OBJECT_FLAG_ALL (DEG_ITER_OBJECT_FLAG_SET | DEG_ITER_OBJECT_FLAG_DUPLI) -typedef struct DEGObjectsIteratorData { +typedef struct DEGOIterObjectData { struct Depsgraph *graph; struct Scene *scene; struct EvaluationContext eval_ctx; @@ -103,22 +103,22 @@ typedef struct DEGObjectsIteratorData { /* **** Iteration ober ID nodes **** */ size_t id_node_index; size_t num_id_nodes; -} DEGObjectsIteratorData; +} DEGOIterObjectData; -void DEG_objects_iterator_begin(struct BLI_Iterator *iter, DEGObjectsIteratorData *data); -void DEG_objects_iterator_next(struct BLI_Iterator *iter); -void DEG_objects_iterator_end(struct BLI_Iterator *iter); +void DEG_iterator_objects_begin(struct BLI_Iterator *iter, DEGOIterObjectData *data); +void DEG_iterator_objects_next(struct BLI_Iterator *iter); +void DEG_iterator_objects_end(struct BLI_Iterator *iter); #define DEG_OBJECT_ITER(graph_, instance_, flag_) \ { \ - DEGObjectsIteratorData data_ = { \ + DEGOIterObjectData data_ = { \ .graph = (graph_), \ .flag = (flag_), \ }; \ \ - ITER_BEGIN(DEG_objects_iterator_begin, \ - DEG_objects_iterator_next, \ - DEG_objects_iterator_end, \ + ITER_BEGIN(DEG_iterator_objects_begin, \ + DEG_iterator_objects_next, \ + DEG_iterator_objects_end, \ &data_, Object *, instance_) #define DEG_OBJECT_ITER_END \ |