[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11002] trunk/blender/intern/boolop/intern /BOP_Face2Face.cpp: Tools

[Ken Hughes]

Revision: 11002
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11002
Author:   khughes
Date:     2007-06-21 23:58:04 +0200 (Thu, 21 Jun 2007)

Log Message:
-----------
Tools
-----
Bugfix #6847: Boolean code was marking some valid faces as "PHANTOM" when the
three vertices were nearly co-linear (according to its tests).  This
introduced holes into one or both meshes which could then result in either
holes in the final results and/or spurrious faces which should have been
split.

This commit removes the code in question until either an alternative test is
coded.

Modified Paths:
--------------
    trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp

Modified: trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp	2007-06-21 14:04:07 UTC (rev 11001)
+++ trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp	2007-06-21 21:58:04 UTC (rev 11002)
@@ -427,11 +427,17 @@
 						// v2 ~= v3
 						mesh->replaceVertexIndex(v2,v3);
 					} else {
+#if 0
+	/*
+	 * for now, don't just remove "co-linear" faces; some of these faces
+	 * being removed are real and cause other things to break
+	 */
 						// all differents
 						if (BOP_collinear(vertex1,vertex2,vertex3)) {
 							// collinear triangle 
 							face->setTAG(PHANTOM);
 						}
+#endif
 					}
 				}
 			}