Rename any instance of scene layer or render layer in code with view layer
[blender.git] / source / blender / blenkernel / intern / dynamicpaint.c
index 728167efa04cd637664381208c2165f6cbddfdb0..394075c179240e875699fdfe959035a173a45e0b 100644 (file)
@@ -488,7 +488,7 @@ static void scene_setSubframe(Scene *scene, float subframe)
        scene->r.subframe = subframe;
 }
 
-static int surface_getBrushFlags(DynamicPaintSurface *surface, const SceneLayer *sl)
+static int surface_getBrushFlags(DynamicPaintSurface *surface, const ViewLayer *sl)
 {
        Base *base = NULL;
        GroupObject *go = NULL;
@@ -5639,7 +5639,7 @@ static void dynamic_paint_generate_bake_data_cb(void *userdata, const int index)
        }
 }
 
-static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const SceneLayer *sl, Object *ob)
+static int dynamicPaint_generateBakeData(DynamicPaintSurface *surface, const ViewLayer *sl, Object *ob)
 {
        PaintSurfaceData *sData = surface->data;
        PaintBakeData *bData = sData->bData;
@@ -5783,7 +5783,7 @@ static int dynamicPaint_doStep(const struct EvaluationContext *eval_ctx, Scene *
                GroupObject *go = NULL;
                Object *brushObj = NULL;
                ModifierData *md = NULL;
-               SceneLayer *sl = eval_ctx->scene_layer;
+               ViewLayer *sl = eval_ctx->view_layer;
 
                /* backup current scene frame */
                int scene_frame = scene->r.cfra;
@@ -5941,7 +5941,7 @@ int dynamicPaint_calculateFrame(
                dynamicPaint_applySurfaceDisplace(surface, surface->canvas->dm);
 
        /* update bake data */
-       dynamicPaint_generateBakeData(surface, eval_ctx->scene_layer, cObject);
+       dynamicPaint_generateBakeData(surface, eval_ctx->view_layer, cObject);
 
        /* don't do substeps for first frame */
        if (surface->substeps && (frame != surface->start_frame)) {