Pass EvaluationContext argument everywhere

Note that some little parts of code have been dissabled because eval_ctx
was not available there. This should be resolved once DerivedMesh is
replaced.

1 files changed, 9 insertions, 1 deletions

diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c
index cd07b57577b..1f0ee6862d2 100644
--- a/source/blender/editors/physics/dynamicpaint_ops.c
+++ b/source/blender/editors/physics/dynamicpaint_ops.c
@@ -294,6 +294,8 @@ typedef struct DynamicPaintBakeJob {
 	DynamicPaintSurface *surface;
 	DynamicPaintCanvasSettings *canvas;
 
+	EvaluationContext *eval_ctx;
+
 	int success;
 	double start;
 } DynamicPaintBakeJob;
@@ -313,6 +315,8 @@ static void dpaint_bake_endjob(void *customdata)
 
 	dynamicPaint_freeSurfaceData(job->surface);
 
+	MEM_freeN(job->eval_ctx);
+
 	G.is_rendering = false;
 	BKE_spacedata_draw_locks(false);
 
@@ -387,7 +391,7 @@ static void dynamicPaint_bakeImageSequence(DynamicPaintBakeJob *job)
 		/* calculate a frame */
 		scene->r.cfra = (int)frame;
 		ED_update_for_newframe(job->bmain, scene, 1);
-		if (!dynamicPaint_calculateFrame(surface, scene, job->scene_layer, cObject, frame)) {
+		if (!dynamicPaint_calculateFrame(surface, job->eval_ctx, scene, cObject, frame)) {
 			job->success = 0;
 			return;
 		}
@@ -456,6 +460,9 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op)
 	Object *ob = ED_object_context(C);
 	Scene *scene = CTX_data_scene(C);
 	SceneLayer *sl = CTX_data_scene_layer(C);
+	EvaluationContext *eval_ctx = MEM_mallocN(sizeof(*eval_ctx), "EvaluationContext");
+
+	CTX_data_eval_ctx(C, eval_ctx);
 
 	DynamicPaintSurface *surface;
 
@@ -487,6 +494,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op)
 	job->ob = ob;
 	job->canvas = canvas;
 	job->surface = surface;
+	job->eval_ctx = eval_ctx;
 
 	wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene,
 	                            "Dynamic Paint Bake", WM_JOB_PROGRESS,