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_warp.c | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_warp.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_warp.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_warp.c b/source/blender/modifiers/intern/MOD_warp.c index 34e69f570d5..f6585521269 100644 --- a/source/blender/modifiers/intern/MOD_warp.c +++ b/source/blender/modifiers/intern/MOD_warp.c @@ -148,8 +148,9 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void warpModifier_do(WarpModifierData *wmd, Object *ob, - Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void warpModifier_do( + WarpModifierData *wmd, Object *ob, + Mesh *mesh, float (*vertexCos)[3], int numVerts) { float obinv[4][4]; float mat_from[4][4]; @@ -303,8 +304,9 @@ static void warpModifier_do(WarpModifierData *wmd, Object *ob, } } -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 = mesh; @@ -317,8 +319,9 @@ static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, Mesh * warpModifier_do((WarpModifierData *)md, ctx->object, mesh_src, vertexCos, numVerts); } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em, - Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *em, + Mesh *mesh, float (*vertexCos)[3], int numVerts) { Mesh *mesh_src = mesh; |