Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'extern/carve/patches/face_hole_merge_workaround.patch')
-rw-r--r--extern/carve/patches/face_hole_merge_workaround.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/extern/carve/patches/face_hole_merge_workaround.patch b/extern/carve/patches/face_hole_merge_workaround.patch
deleted file mode 100644
index 834e03a4b12..00000000000
--- a/extern/carve/patches/face_hole_merge_workaround.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r e82d852e4fb0 lib/intersect_face_division.cpp
---- a/lib/intersect_face_division.cpp Wed Jan 15 13:16:14 2014 +1100
-+++ b/lib/intersect_face_division.cpp Thu Mar 13 15:39:26 2014 +0600
-@@ -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(),