[Bf-blender-cvs] [ea883db] temp_merge_gooseberry_hair: Disabled collision culling on the inside of the collider faces for now, this seems to remove too many contact points somehow ...

[Lukas Tönne]

Commit: ea883db9abdddaec5f098681c3b62ad1e57c9a30
Author: Lukas Tönne
Date:   Thu Sep 4 15:06:15 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rBea883db9abdddaec5f098681c3b62ad1e57c9a30

Disabled collision culling on the inside of the collider faces for now,
this seems to remove too many contact points somehow ...

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

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

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

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 1e742d5..b13eb9d 100644
--- a/source/blender/blenkernel/intern/collision.c
+++ b/source/blender/blenkernel/intern/collision.c
@@ -1228,7 +1228,8 @@ static CollPair *cloth_point_collpair(float p1[3], float p2[3], MVert *mverts, i
 	distance1 = dot_v3v3(v1p1, facenor);
 	sub_v3_v3v3(v1p2, p2, co1);
 	distance2 = dot_v3v3(v1p2, facenor);
-	if (distance2 > epsilon || (distance1 < 0.0f && distance2 < 0.0f))
+//	if (distance2 > epsilon || (distance1 < 0.0f && distance2 < 0.0f))
+	if (distance2 > epsilon)
 		return collpair;
 	
 	collpair->face1 = index_cloth; /* XXX actually not a face, but equivalent index for point */