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_hook.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_hook.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 0a2510ba2be..05fb6bb43bc 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -251,8 +251,9 @@ static void hook_co_apply(struct HookData_cb *hd, const int j) } } -static void deformVerts_do(HookModifierData *hmd, Object *ob, Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts_do( + HookModifierData *hmd, Object *ob, Mesh *mesh, + float (*vertexCos)[3], int numVerts) { bPoseChannel *pchan = BKE_pose_channel_find_name(hmd->object->pose, hmd->subtarget); float dmat[4][4]; @@ -348,8 +349,9 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, Mesh *mesh, } } -static void deformVerts(struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts) +static void deformVerts( + struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh, + float (*vertexCos)[3], int numVerts) { HookModifierData *hmd = (HookModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); @@ -361,9 +363,10 @@ static void deformVerts(struct ModifierData *md, const struct ModifierEvalContex } } -static void deformVertsEM(struct ModifierData *md, const struct ModifierEvalContext *ctx, - struct BMEditMesh *editData, - struct Mesh *mesh, float (*vertexCos)[3], int numVerts) +static void deformVertsEM( + struct ModifierData *md, const struct ModifierEvalContext *ctx, + struct BMEditMesh *editData, + struct Mesh *mesh, float (*vertexCos)[3], int numVerts) { HookModifierData *hmd = (HookModifierData *)md; Mesh *mesh_src = get_mesh(ctx->object, editData, mesh, NULL, false, false); |