diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-06 17:01:51 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-06 17:44:51 +0300 |
| commit | 4e213d42162b8d38435911352e52dbb609e36769 (patch) | |
| tree | b70fd088d8ba5452aaf9fc4a88876a0cdfbdc2b1 /source/blender/depsgraph/DEG_depsgraph_query.h | |
| parent | 9a0506ea185c0ca6505e85ea0f5f5dc5fc48aa62 (diff) | |
Depsgraph iterator: Remove explicit mode
We can get the mode from the depsgraph itself.
Diffstat (limited to 'source/blender/depsgraph/DEG_depsgraph_query.h')
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph_query.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h index 7a4d9a19335..1c4e11d1197 100644 --- a/source/blender/depsgraph/DEG_depsgraph_query.h +++ b/source/blender/depsgraph/DEG_depsgraph_query.h @@ -107,14 +107,8 @@ enum { DEG_ITER_OBJECT_FLAG_DUPLI = (1 << 4), }; -typedef enum eDepsObjectIteratorMode { - DEG_ITER_OBJECT_MODE_VIEWPORT = 0, - DEG_ITER_OBJECT_MODE_RENDER = 1, -} eDepsObjectIteratorMode; - typedef struct DEGObjectIterData { struct Depsgraph *graph; - eDepsObjectIteratorMode mode; int flag; struct Scene *scene; @@ -152,11 +146,10 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter); * Although they are available they have no overrides (collection_properties) * and will crash if you try to access it. */ -#define DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_, flag_) \ +#define DEG_OBJECT_ITER_BEGIN(graph_, instance_, flag_) \ { \ DEGObjectIterData data_ = { \ graph_, \ - mode_, \ flag_ \ }; \ \ @@ -172,8 +165,8 @@ void DEG_iterator_objects_end(struct BLI_Iterator *iter); /** * Depsgraph objects iterator for draw manager and final render */ -#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(graph_, instance_, mode_) \ - DEG_OBJECT_ITER_BEGIN(graph_, instance_, mode_, \ +#define DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(graph_, instance_) \ + DEG_OBJECT_ITER_BEGIN(graph_, instance_, \ DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | \ DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET | \ DEG_ITER_OBJECT_FLAG_VISIBLE | \ |