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_collision.c | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 6ec1f4d8e5c..83fbf676beb 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -95,10 +95,11 @@ static bool dependsOnTime(ModifierData *UNUSED(md)) return true; } -static void deformVerts(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int UNUSED(numVerts)) +static void deformVerts( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *derivedData, + float (*vertexCos)[3], + int UNUSED(numVerts)) { CollisionModifierData *collmd = (CollisionModifierData *) md; DerivedMesh *dm = NULL; |