Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-05-10 15:00:02 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-05-10 15:00:02 +0400
commit89b61e5430ee5f3fcd32c9b4989ecacc04107306 (patch)
tree4abdab1012510d396101b576d6e4c9dd38033f87 /extern/carve/lib
parentb73307471f885e9031a376cf12a9d93515751eb0 (diff)
Bundle updated version of carve. Should be no functional changes, small code cleanup
Diffstat (limited to 'extern/carve/lib')
-rw-r--r--extern/carve/lib/intersect.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/extern/carve/lib/intersect.cpp b/extern/carve/lib/intersect.cpp
index 35166a6411e..2063164de08 100644
--- a/extern/carve/lib/intersect.cpp
+++ b/extern/carve/lib/intersect.cpp
@@ -647,12 +647,9 @@ void carve::csg::CSG::_generateVertexEdgeIntersections(carve::mesh::MeshSet<3>::
return;
}
- if (std::min(eb->v1()->v.x, eb->v2()->v.x) - carve::EPSILON > va->v.x ||
- std::max(eb->v1()->v.x, eb->v2()->v.x) + carve::EPSILON < va->v.x ||
- std::min(eb->v1()->v.y, eb->v2()->v.y) - carve::EPSILON > va->v.y ||
- std::max(eb->v1()->v.y, eb->v2()->v.y) + carve::EPSILON < va->v.y ||
- std::min(eb->v1()->v.z, eb->v2()->v.z) - carve::EPSILON > va->v.z ||
- std::max(eb->v1()->v.z, eb->v2()->v.z) + carve::EPSILON < va->v.z) {
+ carve::geom::aabb<3> eb_aabb;
+ eb_aabb.fit(eb->v1()->v, eb->v2()->v);
+ if (eb_aabb.maxAxisSeparation(va->v) > carve::EPSILON) {
return;
}