diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-17 08:59:14 +0400 |
| commit | 1ff373ef5bb0c1462ad8b0f30cfb773e30cbb2bb (patch) | |
| tree | b6ec7b01b644cc8c0d4d743a4d3d94551b59f2b1 /source/blender/blenkernel/intern/collision.c | |
| parent | 594b0298c7a672fca44890d3afd1e5bf4f06c1da (diff) | |
| parent | 2636be0ac0d3139b2c9cf54f6380b2e9a3d3ed51 (diff) | |
svn merge -r40166:40279 ^/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 03405c28074..700c6693a24 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -2022,7 +2022,7 @@ static int cloth_collision_moving_edges ( ClothModifierData *clmd, CollisionModi { if(edgecollpair.p21==6 || edgecollpair.p22 == 6) { - printf("dist: %f, sol[k]: %lf, sol2[k]: %lf\n", distance, solution[k], solution2[k]); + printf("dist: %f, sol[k]: %f, sol2[k]: %f\n", distance, solution[k], solution2[k]); printf("a1: %f, a2: %f, b1: %f, b2: %f\n", x1[0], x2[0], x3[0], v1[0]); printf("b21: %d, b22: %d\n", edgecollpair.p21, edgecollpair.p22); } |