diff options
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 3 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_eval.cc | 2 | ||||
| -rw-r--r-- | source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 932a7c51286..e05b417f245 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -65,6 +65,7 @@ struct Main; struct PointerRNA; struct PropertyRNA; +struct RenderEngineType; struct Scene; struct SceneLayer; @@ -84,6 +85,7 @@ typedef struct EvaluationContext { float ctime; struct SceneLayer *scene_layer; + struct RenderEngineType *engine; } EvaluationContext; /* DagNode->eval_flags */ @@ -213,6 +215,7 @@ void DEG_evaluation_context_init(struct EvaluationContext *eval_ctx, void DEG_evaluation_context_init_from_scene(struct EvaluationContext *eval_ctx, struct Scene *scene, struct SceneLayer *scene_layer, + struct RenderEngineType *engine, eEvaluationMode mode); /* Free evaluation context. */ diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc index 77a32740524..9235069f531 100644 --- a/source/blender/depsgraph/intern/depsgraph_eval.cc +++ b/source/blender/depsgraph/intern/depsgraph_eval.cc @@ -79,10 +79,12 @@ void DEG_evaluation_context_init(EvaluationContext *eval_ctx, void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx, Scene *scene, SceneLayer *scene_layer, + RenderEngineType *engine, eEvaluationMode mode) { DEG_evaluation_context_init(eval_ctx, mode); eval_ctx->scene_layer = scene_layer; + eval_ctx->engine = engine; eval_ctx->ctime = BKE_scene_frame_get(scene); } diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 03be601ce2c..e4f1e8b9cf6 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -527,9 +527,9 @@ void update_copy_on_write_scene(const Depsgraph *depsgraph, scene_cow->obedit = NULL; } /* Synchronize active render engine. */ - BLI_strncpy_utf8(scene_cow->r.engine, - scene_orig->r.engine, - sizeof(scene_cow->r.engine)); + BLI_strncpy_utf8(scene_cow->view_render.engine_id, + scene_orig->view_render.engine_id, + sizeof(scene_cow->view_render.engine_id)); /* TODO(sergey): What else do we need here? */ } |