diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 23:57:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-11-05 23:57:59 +0400 |
| commit | da24aa8d109a08b40b5547aacf3586026de78af2 (patch) | |
| tree | d5590332991dd496493c4c2a3819c91dff91b75b /extern | |
| parent | 712af7f097858a2fa28b73816b40de11f7beb48d (diff) | |
Merging r51897 through r51922 from trunk into soc-2011-tomato
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/carve/lib/intersect_face_division.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extern/carve/lib/intersect_face_division.cpp b/extern/carve/lib/intersect_face_division.cpp index 08550c021ad..c74b52dd557 100644 --- a/extern/carve/lib/intersect_face_division.cpp +++ b/extern/carve/lib/intersect_face_division.cpp @@ -1106,7 +1106,8 @@ namespace { } // copy up to the end of the path. - std::copy(base_loop.begin() + pos, base_loop.begin() + e1_1, std::back_inserter(out)); + if (pos < e1_1) + 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)); |