[Bf-blender-cvs] [cd8581a] master: Fix T45706: Axis aligned tri-tri intersection

Campbell Barton noreply at git.blender.org
Wed Aug 19 04:26:18 CEST 2015


Commit: cd8581af8ebe236fe59d659ef27c31f139f038f7
Author: Campbell Barton
Date:   Wed Aug 19 12:18:58 2015 +1000
Branches: master
https://developer.blender.org/rBcd8581af8ebe236fe59d659ef27c31f139f038f7

Fix T45706: Axis aligned tri-tri intersection

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

M	source/blender/blenlib/intern/math_geom.c

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

diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index e05cd7c..197a50d 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -1522,7 +1522,7 @@ bool isect_tri_tri_epsilon_v3(
 				        isect_co, isect_co_other,
 				        tri_pair[t][j], tri_pair[t][j_prev],
 				        ix_span, ix_tri,
-				        epsilon) == 2)
+				        epsilon) != 0)
 				{
 					const float edge_fac = line_point_factor_v3(ix_tri, tri_pair[t][j], tri_pair[t][j_prev]);
 					if (edge_fac >= -epsilon && edge_fac <= 1.0f + epsilon) {




More information about the Bf-blender-cvs mailing list