[Bf-blender-cvs] [309b12ac27] cloth-improvements: Implement self col groups for new self col system

Luca Rood noreply at git.blender.org
Fri Jan 20 05:38:51 CET 2017


Commit: 309b12ac2713b46f1d1845ca3baa2dd1a4a990d8
Author: Luca Rood
Date:   Fri Jan 20 02:03:05 2017 -0200
Branches: cloth-improvements
https://developer.blender.org/rB309b12ac2713b46f1d1845ca3baa2dd1a4a990d8

Implement self col groups for new self col system

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

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

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

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index dbf6f2f38c..b8b49033c1 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -749,6 +749,12 @@ static CollPair* cloth_selfcollision(ModifierData *md1, BVHTreeOverlap *overlap,
 		}
 	}
 
+	if (((verts1[tri_a->tri[0]].flags & verts1[tri_a->tri[1]].flags & verts1[tri_a->tri[2]].flags) |
+	     (verts1[tri_b->tri[0]].flags & verts1[tri_b->tri[1]].flags & verts1[tri_b->tri[2]].flags)) & CLOTH_VERT_FLAG_NOSELFCOLL)
+	{
+		return collpair;
+	}
+
 	/* fill face_a */
 	collpair->ap1 = tri_a->tri[0];
 	collpair->ap2 = tri_a->tri[1];




More information about the Bf-blender-cvs mailing list