diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-28 11:34:48 +0400 |
| commit | 4a157de23d43c22abec8bd6922f0355334e413f8 (patch) | |
| tree | c8ca75fef261ce1316ea9042aa4bd689aa4eb584 /source/blender/blenkernel/intern/collision.c | |
| parent | dbdb58f2a3c0d086afabdacab40c4d83c79e1a04 (diff) | |
| parent | bc593cac2354c863f074d9d51cffb3dca9f499a3 (diff) | |
svn merge ^/trunk/blender -r40587:40643
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 700c6693a24..fcf9f69ed0c 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1375,7 +1375,8 @@ static CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTree return collpair; } -static void machine_epsilon_offset(Cloth *cloth) { +static void machine_epsilon_offset(Cloth *cloth) +{ ClothVertex *cv; int i, j; |