diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-28 17:06:32 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-28 17:06:32 +0300 |
| commit | 178ea1f7982922f319e55de9288352d3a3e4af43 (patch) | |
| tree | 9c9e5f2c8b534318b9448d2053a7a29a222765a2 /source/blender/blenkernel/intern | |
| parent | e5a74f3ad31e1ee55e086de682c7d01b8d27697e (diff) | |
Cleanup, naming of engine type variable
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index b9fef2993b6..5b0df663cc9 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -1269,8 +1269,8 @@ void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx) Scene *scene = CTX_data_scene(C); ViewLayer *view_layer = CTX_data_view_layer(C); - RenderEngineType *engine = CTX_data_engine(C); + RenderEngineType *engine_type = CTX_data_engine(C); DEG_evaluation_context_init_from_scene(eval_ctx, - scene, view_layer, engine, + scene, view_layer, engine_type, DAG_EVAL_VIEWPORT); } diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index ced94af26d2..f925259e206 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3321,7 +3321,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq context->scene->r.seq_prev_type = 3 /* == OB_SOLID */; /* opengl offscreen render */ - context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id); + context->eval_ctx->engine_type = RE_engines_find(scene->view_render.engine_id); BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer); ibuf = sequencer_view3d_cb( /* set for OpenGL render (NULL when scrubbing) */ |