[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54328] trunk/blender/extern/carve/lib/ intersect_face_division.cpp: Workaround for deadlock in face/ hole merge function in carve

[Sergey Sharybin]

Revision: 54328
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54328
Author:   nazgul
Date:     2013-02-05 14:27:24 +0000 (Tue, 05 Feb 2013)
Log Message:
-----------
Workaround for deadlock in face/hole merge function in carve
which could happen in cases of degenerated faces.

Modified Paths:
--------------
    trunk/blender/extern/carve/lib/intersect_face_division.cpp

Modified: trunk/blender/extern/carve/lib/intersect_face_division.cpp
===================================================================
--- trunk/blender/extern/carve/lib/intersect_face_division.cpp	2013-02-05 14:25:22 UTC (rev 54327)
+++ trunk/blender/extern/carve/lib/intersect_face_division.cpp	2013-02-05 14:27:24 UTC (rev 54328)
@@ -719,6 +719,10 @@
           unassigned--;
         }
       }
+
+      if (!removed.size())
+        throw carve::exception("Failed to merge holes");
+
       for (std::set<int>::iterator f = removed.begin(); f != removed.end(); ++f) {
         for (unsigned i = 0; i < containing_faces.size(); ++i) {
           containing_faces[i].erase(std::remove(containing_faces[i].begin(),