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/lib/intersect_face_division.cpp | |
| 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/lib/intersect_face_division.cpp')
| -rw-r--r-- | extern/carve/lib/intersect_face_division.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extern/carve/lib/intersect_face_division.cpp b/extern/carve/lib/intersect_face_division.cpp index c5d5d8c5152..3b771bc8f3e 100644 --- a/extern/carve/lib/intersect_face_division.cpp +++ b/extern/carve/lib/intersect_face_division.cpp @@ -1110,8 +1110,7 @@ namespace { } // copy up to the end of the path. - if (pos < e1_1) - std::copy(base_loop.begin() + pos, base_loop.begin() + e1_1, std::back_inserter(out)); + std::copy(base_loop.begin() + pos, base_loop.begin() + e1_1, std::back_inserter(out)); CARVE_ASSERT(base_loop[e1_1] == p1.back()); std::copy(p1.rbegin(), p1.rend() - 1, std::back_inserter(out)); |