diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-04-21 10:14:13 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-21 10:14:13 +0300 |
| commit | 2b9738b7f814a7c5cae02d283d0958a2a0284cb5 (patch) | |
| tree | c3902e3a9d865c983630229b98cd14c0275c6763 /source/blender/modifiers/intern/MOD_surfacedeform.c | |
| parent | c4780ee45927b25d6bb186261b3fab75c7214471 (diff) | |
| parent | 13ee5ba467d69b80f025d0d2542ed190ad1667db (diff) | |
Merge branch 'master' into 28
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 bf6a0bdd234..97145d9be7b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1178,7 +1178,7 @@ static bool isDisabled(ModifierData *md, int UNUSED(useRenderParams)) { SurfaceDeformModifierData *smd = (SurfaceDeformModifierData *)md; - return !smd->target; + return !smd->target && !(smd->verts && !(smd->flags & MOD_SDEF_BIND)); } ModifierTypeInfo modifierType_SurfaceDeform = { |