diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-26 17:07:39 +0300 |
| commit | fbaf6e6fb3d2eb2f0c737b7d4713a5ea171738e6 (patch) | |
| tree | 35bfa54eef6240693a13d594bb49ed7c8d33b32e /source/blender/modifiers/intern/MOD_surfacedeform.c | |
| parent | bba0ad903cfa407368c78b0b8480b1a729474305 (diff) | |
| parent | c07f2bc89196ea449a2875634eb85efa45733fb5 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into temp-dynamic-overridestemp-dynamic-overrides
Diffstat (limited to 'source/blender/modifiers/intern/MOD_surfacedeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_surfacedeform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index e964da0a8d1..a3ab2d74602 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1195,7 +1195,7 @@ static void deformVertsEM( surfacedeformModifier_do(md, ctx, vertexCos, numVerts, ctx->object); } -static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) +static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, int UNUSED(useRenderParams)) { SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; |