diff options
| author | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2012-07-04 21:15:05 +0400 |
| commit | 9324503b84a06f76af072131da947547c84698ed (patch) | |
| tree | b9336118dcf8df9e9ca4888d9ee3ac9fec2c2798 /source/blender/blenkernel/intern/collision.c | |
| parent | 234c338655fc49efef0b7ffe0ef6736e8630411a (diff) | |
| parent | 958cf139f6587df631944f6ec0fcb4111c7e58fa (diff) | |
Merge with trunk r48602
Diffstat (limited to 'source/blender/blenkernel/intern/collision.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 1bd650ef568..d99c36b6c91 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -325,8 +325,7 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM result = 1; } - else - { + else { // Apply repulse impulse if distance too short // I_r = -min(dt*kd, max(0, 1d/dt - v_n)) // DG: this formula ineeds to be changed for this code since we apply impulses/repulses like this: |