[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51899] trunk/blender/intern/bsp/intern/ BOP_CarveInterface.cpp: Partial revert of own rev44548.

[Sergey Sharybin]

Revision: 51899
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51899
Author:   nazgul
Date:     2012-11-05 12:11:43 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
Partial revert of own rev44548.

That was more like workaround which solved particular issue with freestyle
rendering, but introduced some more uncontrollable issues, main of which is
recursive fracture would likely suffer from non-manifolds results of previous
step.

Boolean operation is not the only way to generate zero-area face, it could
also happen with character animation and it's indeed better be solved from
freestule side.

This should fix: #33041 Boolean difference sometimes produces meshes with holes

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44548

Modified Paths:
--------------
    trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp

Modified: trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp	2012-11-05 11:57:14 UTC (rev 51898)
+++ trunk/blender/intern/bsp/intern/BOP_CarveInterface.cpp	2012-11-05 12:11:43 UTC (rev 51899)
@@ -559,8 +559,6 @@
 
 		if (v1 == v2 || v2 == v3 || v1 == v3)
 			return true;
-
-		return triangleArea(face->edge->prev->vert->v, face->edge->vert->v, face->edge->next->vert->v) < DBL_EPSILON;
 	}
 	else if (face->n_edges == 4) {
 		uint v1, v2, v3, v4;
@@ -572,9 +570,6 @@
 
 		if (v1 == v2 || v1 == v3 || v1 == v4 || v2 == v3 || v2 == v4 || v3 == v4)
 			return true;
-
-		return triangleArea(face->edge->vert->v, face->edge->next->vert->v, face->edge->next->next->vert->v) +
-		       triangleArea(face->edge->prev->vert->v, face->edge->vert->v, face->edge->next->next->vert->v) < DBL_EPSILON;
 	}
 
 	return false;