diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-07-10 00:49:03 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-07-10 00:49:03 +0400 |
commit | 7f28ddfa8a2d77ee4941ab677f16a2dfcd24566a (patch) | |
tree | 5f69a10714fa20e26f022dc6715d06897c2b6927 /extern/carve/patches | |
parent | b8111fbea0c6313a8f52032b05eff51214c6d2fb (diff) |
Merge from turnk r48565-r48768
Diffstat (limited to 'extern/carve/patches')
-rw-r--r-- | extern/carve/patches/strict_flags.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/carve/patches/strict_flags.patch b/extern/carve/patches/strict_flags.patch index 5c7e8967d39..c1046b78c5f 100644 --- a/extern/carve/patches/strict_flags.patch +++ b/extern/carve/patches/strict_flags.patch @@ -9,9 +9,9 @@ diff -r 47dfdaff1dd5 include/carve/csg_triangulator.hpp } carve::mesh::MeshSet<3>::face_t *mergeQuad(edge_map_t::iterator i, edge_map_t &edge_map) { -diff -r 47dfdaff1dd5 src/selfintersect.cpp ---- a/src/selfintersect.cpp Thu Jan 12 15:49:04 2012 -0500 -+++ b/src/selfintersect.cpp Fri Jan 13 03:13:32 2012 +0600 +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. |