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.

1 files changed, 6 insertions, 0 deletions

diff --git a/intern/boolop/intern/BOP_Face2Face.cpp b/intern/boolop/intern/BOP_Face2Face.cpp
index 7e2b6bd7b2f..745c64eaa97 100644
--- a/intern/boolop/intern/BOP_Face2Face.cpp
+++ b/intern/boolop/intern/BOP_Face2Face.cpp
@@ -427,11 +427,17 @@ void BOP_mergeVertexs(BOP_Mesh *mesh, unsigned int firstFace)
 						// 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
 					}
 				}
 			}