diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
| commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
| tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_meshdeform.c | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshdeform.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshdeform.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 1e6fa0664df..26761d8ef91 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -411,10 +411,11 @@ static void meshdeformModifier_do( if (free_cagemesh) BKE_id_free(NULL, cagemesh); } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); @@ -427,11 +428,12 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, } } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - Mesh *mesh, - float (*vertexCos)[3], - int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + Mesh *mesh, + float (*vertexCos)[3], + int numVerts) { Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); |