[Bf-blender-cvs] [579cb774dac] master: Fix hair collision error introduced in recent commit

[Germano Cavalcante]

Commit: 579cb774dac6295c90e35ef8e74ea51ec570c814
Author: Germano Cavalcante
Date:   Wed Aug 12 18:40:48 2020 -0300
Branches: master
https://developer.blender.org/rB579cb774dac6295c90e35ef8e74ea51ec570c814

Fix hair collision error introduced in recent commit

===================================================================

M       source/blender/blenkernel/intern/collision.c

===================================================================

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]);
+      }
     }
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs