diff options
| author | Luca Rood <dev@lucarood.com> | 2017-04-21 15:28:23 +0300 |
|---|---|---|
| committer | Luca Rood <dev@lucarood.com> | 2017-04-24 17:09:04 +0300 |
| commit | 913e9350a56dc384d76a4b1cce36300764c35011 (patch) | |
| tree | d9639d9f1334314f2f50e3a3747f841a06a3b093 /source/blender/editors/physics/dynamicpaint_ops.c | |
| parent | 2010dbe8a59e80775219fb5162f3c2f5dfd24e04 (diff) | |
Convert BaseLegacy to Base (part)
Diffstat (limited to 'source/blender/editors/physics/dynamicpaint_ops.c')
| -rw-r--r-- | source/blender/editors/physics/dynamicpaint_ops.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index 3d7a45843cc..af2dc31e34f 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -286,6 +286,7 @@ typedef struct DynamicPaintBakeJob { struct Main *bmain; Scene *scene; + SceneLayer *scene_layer; Object *ob; DynamicPaintSurface *surface; @@ -384,7 +385,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, cObject, frame)) { + if (!dynamicPaint_calculateFrame(surface, scene, job->scene_layer, cObject, frame)) { job->success = 0; return; } @@ -452,6 +453,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) DynamicPaintCanvasSettings *canvas; Object *ob = ED_object_context(C); Scene *scene = CTX_data_scene(C); + SceneLayer *sl = CTX_data_scene_layer(C); DynamicPaintSurface *surface; @@ -479,6 +481,7 @@ static int dynamicpaint_bake_exec(struct bContext *C, struct wmOperator *op) DynamicPaintBakeJob *job = MEM_mallocN(sizeof(DynamicPaintBakeJob), "DynamicPaintBakeJob"); job->bmain = CTX_data_main(C); job->scene = scene; + job->scene_layer = sl; job->ob = ob; job->canvas = canvas; job->surface = surface; |