Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-09-04 17:05:12 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2015-01-20 11:29:57 +0300
commit4bfd3c8f0cb0b52b8748a07b3e8695a2c3063c64 (patch)
tree79de60e6f00d276780f265bdd5f0cc96ff652719 /source/blender/blenkernel/intern/collision.c
parent27ecda9995725f7e4b02211108be730b02530769 (diff)
Fix for collision response, the impulse response was far too small.
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
-rw-r--r--source/blender/blenkernel/intern/collision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 78cb468fc54..1e742d581e7 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1020,7 +1020,7 @@ bool cloth_points_collpair_response(ClothModifierData *clmd, CollisionModifierDa
repulse = -margin_distance / dt + dot_v3v3(v1, collpair->normal);
if (margin_distance < -epsilon2) {
- bounce = -v_nor_new + v_nor_old * restitution;
+ bounce = -(v_nor_new + v_nor_old * restitution);
mul_v3_v3fl(r_impulse, collpair->normal, max_ff(repulse, bounce));
}
else {