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_armature.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_armature.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_armature.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 26fe2ff2e4c..8f99bc2bf39 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -111,10 +111,11 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte DEG_add_object_relation(ctx->node, ctx->object, DEG_OB_COMP_TRANSFORM, "Armature Modifier"); } -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) { ArmatureModifierData *amd = (ArmatureModifierData *) md; @@ -169,8 +170,9 @@ static void deformMatricesEM( } } -static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) +static void deformMatrices( + ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { ArmatureModifierData *amd = (ArmatureModifierData *) md; Mesh *mesh_src = get_mesh(ctx->object, NULL, mesh, NULL, false, false); |