diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:27:49 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-06 15:27:49 +0300 |
commit | 885d78150d092756c44519dd9fd19a4d88f02354 (patch) | |
tree | dab1c9b3ce11ee0e1611cde175d2f50ca4c0ef97 /source/blender/depsgraph | |
parent | 5376c739f5bf4029e0a32946e9945a732feba217 (diff) |
Use eObjectMode for function arguments
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 6 | ||||
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index e3d379666a0..8110899048d 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -75,6 +75,8 @@ typedef enum eEvaluationMode { DAG_EVAL_RENDER = 2, /* evaluate for render purposes */ } eEvaluationMode; +#include "DNA_object_enums.h" + /* Dependency graph evaluation context * * This structure stores all the local dependency graph data, @@ -83,7 +85,7 @@ typedef enum eEvaluationMode { typedef struct EvaluationContext { eEvaluationMode mode; float ctime; - short object_mode; + eObjectMode object_mode; struct Depsgraph *depsgraph; struct ViewLayer *view_layer; @@ -219,7 +221,7 @@ void DEG_evaluation_context_init_from_scene( struct Scene *scene, struct ViewLayer *view_layer, struct RenderEngineType *engine_type, - const short object_mode, + const eObjectMode object_mode, eEvaluationMode mode); /* Free evaluation context. */ diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index d7d12bc6968..466808338f8 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -81,7 +81,7 @@ void DEG_evaluation_context_init_from_scene( Scene *scene, ViewLayer *view_layer, RenderEngineType *engine_type, - short object_mode, + eObjectMode object_mode, eEvaluationMode mode) { DEG_evaluation_context_init(eval_ctx, mode); |