[Bf-blender-cvs] [8c453b5] master: Remove redundant zero area face check

Campbell Barton noreply at git.blender.org
Thu Dec 3 12:51:50 CET 2015


Commit: 8c453b599596fa8b1112b165e5c8dcb717264f30
Author: Campbell Barton
Date:   Thu Dec 3 22:44:35 2015 +1100
Branches: master
https://developer.blender.org/rB8c453b599596fa8b1112b165e5c8dcb717264f30

Remove redundant zero area face check

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

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 14e494a..0ff12eb 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -2401,22 +2401,15 @@ bool isect_point_tri_v3(const float p[3], const float v1[3], const float v2[3],
                         float r_vi[3])
 {
 	if (isect_point_tri_prism_v3(p, v1, v2, v3)) {
-		float no[3], n1[3], n2[3];
+		float plane[4];
+		float no[3];
 
 		/* Could use normal_tri_v3, but doesn't have to be unit-length */
-		sub_v3_v3v3(n1, v1, v2);
-		sub_v3_v3v3(n2, v2, v3);
-		cross_v3_v3v3(no, n1, n2);
-
-		if (LIKELY(len_squared_v3(no) != 0.0f)) {
-			float plane[4];
-			plane_from_point_normal_v3(plane, v1, no);
-			closest_to_plane_v3(r_vi, plane, p);
-		}
-		else {
-			/* degenerate */
-			copy_v3_v3(r_vi, p);
-		}
+		cross_tri_v3(no, v1, v2, v3);
+		BLI_assert(len_squared_v3(no) != 0.0f);
+
+		plane_from_point_normal_v3(plane, v1, no);
+		closest_to_plane_v3(r_vi, plane, p);
 
 		return true;
 	}




More information about the Bf-blender-cvs mailing list