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_shapekey.c | |
parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_shapekey.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_shapekey.c | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/source/blender/modifiers/intern/MOD_shapekey.c b/source/blender/modifiers/intern/MOD_shapekey.c index 8c4664414d5..90c339361b7 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.c +++ b/source/blender/modifiers/intern/MOD_shapekey.c @@ -44,10 +44,11 @@ #include "MOD_modifiertypes.h" -static void deformVerts(ModifierData *UNUSED(md), const ModifierEvalContext *ctx, - DerivedMesh *UNUSED(derivedData), - float (*vertexCos)[3], - int numVerts) +static void deformVerts( + ModifierData *UNUSED(md), const ModifierEvalContext *ctx, + DerivedMesh *UNUSED(derivedData), + float (*vertexCos)[3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); @@ -60,8 +61,9 @@ static void deformVerts(ModifierData *UNUSED(md), const ModifierEvalContext *ctx } } -static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, DerivedMesh *derivedData, - float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) +static void deformMatrices( + ModifierData *md, const ModifierEvalContext *ctx, DerivedMesh *derivedData, + float (*vertexCos)[3], float (*defMats)[3][3], int numVerts) { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); @@ -82,11 +84,12 @@ static void deformMatrices(ModifierData *md, const ModifierEvalContext *ctx, Der deformVerts(md, ctx, derivedData, vertexCos, numVerts); } -static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData, - float (*vertexCos)[3], - int numVerts) +static void deformVertsEM( + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + DerivedMesh *derivedData, + float (*vertexCos)[3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); @@ -94,12 +97,13 @@ static void deformVertsEM(ModifierData *md, const ModifierEvalContext *ctx, deformVerts(md, ctx, derivedData, vertexCos, numVerts); } -static void deformMatricesEM(ModifierData *UNUSED(md), const ModifierEvalContext *ctx, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *UNUSED(derivedData), - float (*vertexCos)[3], - float (*defMats)[3][3], - int numVerts) +static void deformMatricesEM( + ModifierData *UNUSED(md), const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + DerivedMesh *UNUSED(derivedData), + float (*vertexCos)[3], + float (*defMats)[3][3], + int numVerts) { Key *key = BKE_key_from_object(ctx->object); KeyBlock *kb = BKE_keyblock_from_object(ctx->object); |