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
path: root/source
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-08-13 00:40:48 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-08-13 00:40:48 +0300
commit579cb774dac6295c90e35ef8e74ea51ec570c814 (patch)
tree5f18347e67a30b2c7aee997626bdcb646045c593 /source
parent5319eb36a5cb54f740bd1930ab7ff205c0ef8314 (diff)
Fix hair collision error introduced in recent commit
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/collision.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index f1d9c153091..05c521e3b94 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -830,7 +830,9 @@ static int cloth_collision_response_static(ClothModifierData *clmd,
if (result) {
cloth_selfcollision_impulse_vert(clamp_sq, i1, &cloth->verts[collpair->ap1]);
cloth_selfcollision_impulse_vert(clamp_sq, i2, &cloth->verts[collpair->ap2]);
- cloth_selfcollision_impulse_vert(clamp_sq, i3, &cloth->verts[collpair->ap3]);
+ if (!is_hair) {
+ cloth_selfcollision_impulse_vert(clamp_sq, i3, &cloth->verts[collpair->ap3]);
+ }
}
}