diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:56:21 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:56:21 +0400 |
| commit | fb3f7d95664dd71a545061ddf8d75726ff423c10 (patch) | |
| tree | 49fa13b4c511d05070ad7f359f2b646ba33dbb09 /source/blender/blenkernel/intern/collision.c | |
| parent | 9bc92b21468f1d0fee77e7aac34145f3f0345dfc (diff) | |
| parent | 22676a434efdb99e38535b2f4a2623ea670ebf4d (diff) | |
svn merge -r39792:39829 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 1fec977851e..04c5caf138a 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1092,7 +1092,7 @@ static int cloth_collision_response_moving ( ClothModifierData *clmd, CollisionM VECADDMUL(cloth1->verts[collpair->ap1].impulse, pimpulse, w1*2.0); VECADDMUL(cloth1->verts[collpair->ap2].impulse, pimpulse, w2*2.0); - VECADDMUL(cloth1->verts[collpair->ap3].impulse, pimpulse, w3*2.0);; + VECADDMUL(cloth1->verts[collpair->ap3].impulse, pimpulse, w3*2.0); cloth1->verts[collpair->ap1].impulse_count++; cloth1->verts[collpair->ap2].impulse_count++; cloth1->verts[collpair->ap3].impulse_count++; |