Aded multiple choice decimater (~4 times faster than the heap one)

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@644 fdac6126-5c0c-442c-9429-916003d36597

src/OpenMesh/Tools/Decimater/DecimaterT.cc

@@ -211,12 +211,10 @@ bool DecimaterT<Mesh>::is_collapse_legal(const CollapseInfo& _ci) {
   // locked ? deleted ?
   if (mesh_.status(_ci.v0).locked() || mesh_.status(_ci.v0).deleted())
     return false;
-  /*
-   if (!mesh_.is_collapse_ok(_ci.v0v1))
-   {
-   return false;
-   }
-   */
+
+  if (!mesh_.is_collapse_ok(_ci.v0v1))
+    return false;
+
   if (_ci.vl.is_valid() && _ci.vr.is_valid()
       && mesh_.find_halfedge(_ci.vl, _ci.vr).is_valid()
       && mesh_.valence(_ci.vl) == 3 && mesh_.valence(_ci.vr) == 3) {