[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60355] trunk/blender/source/blender/bmesh /intern/bmesh_polygon.c: bmesh triangulate: skip intersection checks for degenerate geometry and just triangulate on a fixed loop .

[Campbell Barton]

Revision: 60355
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60355
Author:   campbellbarton
Date:     2013-09-24 12:45:14 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
bmesh triangulate: skip intersection checks for degenerate geometry and just triangulate on a fixed loop.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-09-24 12:43:25 UTC (rev 60354)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c	2013-09-24 12:45:14 UTC (rev 60355)
@@ -865,7 +865,11 @@
 	const float cos_threshold = 0.9f;
 	const float bias = 1.0f + 1e-6f;
 
-	BLI_assert(len_squared_v3(f->no) > FLT_EPSILON);
+	BLI_assert(BM_face_is_normal_valid(f));
+	/* just triangulate degenerate faces */
+	if (UNLIKELY(is_zero_v3(f->no))) {
+		return BM_FACE_FIRST_LOOP(f);
+	}
 
 	if (f->len == 4) {
 		BMLoop *larr[4];