diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-21 12:47:18 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-21 12:47:18 +0400 |
commit | 8a7ce9c924318c8eeaccaed6ec3017d39f510aa3 (patch) | |
tree | 42e914f47f9a203f6c12fa293902a69a4b935082 | |
parent | 1769319ce26814f821744d16f050d49fc33eb6ff (diff) |
Fix #34707: Blender crash on enabling of boolean modifier
Stupid mistake by my own with recent Carve update which
undid fix for MSVC STL library.
-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 3b771bc8f3e..75f7f790df6 100644 --- a/extern/carve/lib/intersect_face_division.cpp +++ b/extern/carve/lib/intersect_face_division.cpp @@ -1110,7 +1110,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)); |