diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-12-26 17:19:25 +0300 |
| commit | e4b20f0180858aaeec9f057e8cc473a01e1e5280 (patch) | |
| tree | fe9e3629ff21435df7027634a91405397c4a9695 /source/blender/blenkernel/intern/collision.c | |
| parent | 63f84cf26d574284a30f2d28c57a6c32823f4425 (diff) | |
2.5: various warning fixes. There was one actual bug in a few different
places, using sprintf with strings like ID names as the format string
(note that this name can contain a % character).
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 9db3dda94eb..4f8068ac252 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -591,7 +591,9 @@ CollPair* cloth_collision ( ModifierData *md1, ModifierData *md2, BVHTreeOverlap ClothModifierData *clmd = ( ClothModifierData * ) md1; CollisionModifierData *collmd = ( CollisionModifierData * ) md2; MFace *face1=NULL, *face2 = NULL; +#ifdef WITH_BULLET ClothVertex *verts1 = clmd->clothObject->verts; +#endif double distance = 0; float epsilon1 = clmd->coll_parms->epsilon; float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree ); |