Tools:
[blender.git] / intern / boolop / intern / BOP_Face2Face.cpp
index 745c64eaa97cd5968b9465af172a79fb3eb51170..9c8ee9f77873f785c185649b40d2defc2d77194b 100644 (file)
@@ -1,4 +1,7 @@
 /**
+ *
+ * $Id$
+ *
  * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -23,7 +26,7 @@
  *
  * The Original Code is: all of this file.
  *
- * Contributor(s): none yet.
+ * Contributor(s): Marc Freixas, Ken Hughes
  *
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
@@ -427,17 +430,11 @@ 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
                                        }
                                }
                        }