diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-25 14:02:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-02-25 14:02:43 +0400 |
| commit | 18fd4bd9f48112fae9f7d29ee88d39cdf5d3a95f (patch) | |
| tree | 950919f9f3b6831b5d097b7abbce57049db000ca /extern/carve/patches | |
| parent | 0479f785ca7c17e037a15286da4440724286eda4 (diff) | |
Update Carve to newest upstream version with some assorted fixes
Perhaps some warnings could be silenced, but not in mood of writing
local patches at this moment. They're all harmless anyway.
Diffstat (limited to 'extern/carve/patches')
| -rw-r--r-- | extern/carve/patches/series | 1 | ||||
| -rw-r--r-- | extern/carve/patches/strict_flags.patch | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/extern/carve/patches/series b/extern/carve/patches/series index 585d90659bd..0b1f731805e 100644 --- a/extern/carve/patches/series +++ b/extern/carve/patches/series @@ -1,4 +1,3 @@ -strict_flags.patch includes.patch win32.patch mesh_iterator.patch diff --git a/extern/carve/patches/strict_flags.patch b/extern/carve/patches/strict_flags.patch deleted file mode 100644 index c1046b78c5f..00000000000 --- a/extern/carve/patches/strict_flags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp ---- a/include/carve/csg_triangulator.hpp Thu Jan 12 15:49:04 2012 -0500 -+++ b/include/carve/csg_triangulator.hpp Fri Jan 13 03:13:32 2012 +0600 -@@ -174,6 +174,7 @@ - - double scoreQuad(edge_map_t::iterator i, edge_map_t &edge_map) { - if (!(*i).second.first || !(*i).second.second) return -1; -+ return 0; - } - - carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) { -diff -r 47dfdaff1dd5 lib/selfintersect.cpp ---- a/lib/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500 -+++ b/lib/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600 -@@ -465,6 +465,7 @@ - - // returns true if no intersection, based upon edge^a_i and edge^b_j separating axis. - bool sat_edge(const vec3 tri_a[3], const vec3 tri_b[3], unsigned i, unsigned j) { -+ return false; - } - - |