diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-09 16:01:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-09 16:09:22 +0300 |
| commit | d533b70b234d6a6cb7a44a556fcbf3fc68f67085 (patch) | |
| tree | b65cb6fdd4151b44bf47237452f684d34547b6e2 /source/blender/depsgraph/DEG_depsgraph_query.h | |
| parent | 867f96c23419269452488ecf80f908c57a84f935 (diff) | |
Fix build error with GCC, make depsgraph iterator compatible with C++.
Diffstat (limited to 'source/blender/depsgraph/DEG_depsgraph_query.h')
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph_query.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index 3a8d6e70aca..8600022b7c3 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -86,11 +86,12 @@ typedef enum eDepsObjectIteratorMode { typedef struct DEGObjectIterData { struct Depsgraph *graph; + eDepsObjectIteratorMode mode; + int flag; + struct Scene *scene; struct EvaluationContext eval_ctx; - int flag; - eDepsObjectIteratorMode mode; int visibility_check; /* eObjectVisibilityCheck. */ /* **** Iteration over dupli-list. *** */ @@ -127,9 +128,9 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter); #define DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_, flag_) \ { \ DEGObjectIterData data_ = { \ - .graph = (graph_), \ - .mode = (mode_), \ - .flag = (flag_), \ + graph_, \ + mode_, \ + flag_ \ }; \ \ ITER_BEGIN(DEG_iterator_objects_begin, \ |