forked from bartvdbraak/blender
Fix T39111: Boolean assert failure on widows
In fact we had this change a while ago, not sue what happened.
This commit is contained in:
parent
bce924b43c
commit
2e128baefd
2
extern/carve/lib/intersect_face_division.cpp
vendored
2
extern/carve/lib/intersect_face_division.cpp
vendored
@ -1121,7 +1121,9 @@ namespace {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// copy up to the end of the path.
|
// 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());
|
CARVE_ASSERT(base_loop[e1_1] == p1.back());
|
||||||
std::copy(p1.rbegin(), p1.rend() - 1, std::back_inserter(out));
|
std::copy(p1.rbegin(), p1.rend() - 1, std::back_inserter(out));
|
||||||
|
14
extern/carve/patches/msvc_fix.patch
vendored
Normal file
14
extern/carve/patches/msvc_fix.patch
vendored
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
diff -r e82d852e4fb0 lib/intersect_face_division.cpp
|
||||||
|
--- a/lib/intersect_face_division.cpp Wed Jan 15 13:16:14 2014 +1100
|
||||||
|
+++ b/lib/intersect_face_division.cpp Wed Mar 12 23:09:19 2014 +0600
|
||||||
|
@@ -1121,7 +1121,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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));
|
1
extern/carve/patches/series
vendored
1
extern/carve/patches/series
vendored
@ -8,3 +8,4 @@ strict_flags.patch
|
|||||||
interpolator_reorder.patch
|
interpolator_reorder.patch
|
||||||
mesh_simplify_dissolve_edges.patch
|
mesh_simplify_dissolve_edges.patch
|
||||||
memory_leak_fix.patch
|
memory_leak_fix.patch
|
||||||
|
mavc_fix.patch
|
||||||
|
Loading…
Reference in New Issue
Block a user