diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:45 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:45 (GMT) |
| commit | e502fab71d998c0bd025512c0c3884a1117479d1 (patch) | |
| tree | 5fb916cf36fcf418b8f384c3429b8342855e9f17 /src/PolySetCGALEvaluator.cc | |
| parent | c4bffdaf37fdf72a84a225ec584d3698fe398857 (diff) | |
| parent | 4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff) | |
Merge branch 'master' into color-priority
Conflicts:
openscad.pro
Diffstat (limited to 'src/PolySetCGALEvaluator.cc')
| -rw-r--r-- | src/PolySetCGALEvaluator.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PolySetCGALEvaluator.cc b/src/PolySetCGALEvaluator.cc index 3285b46..3cd6005 100644 --- a/src/PolySetCGALEvaluator.cc +++ b/src/PolySetCGALEvaluator.cc @@ -26,7 +26,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const ProjectionNode &node) // Before projecting, union all children CGAL_Nef_polyhedron sum; BOOST_FOREACH (AbstractNode * v, node.getChildren()) { - if (v->modinst->tag_background) continue; + if (v->modinst->isBackground()) continue; CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v); if (N.dim == 3) { if (sum.empty()) sum = N.copy(); @@ -259,7 +259,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const LinearExtrudeNode &node) // to a single DxfData, then tesselate this into a PolySet CGAL_Nef_polyhedron sum; BOOST_FOREACH (AbstractNode * v, node.getChildren()) { - if (v->modinst->tag_background) continue; + if (v->modinst->isBackground()) continue; CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v); if (N.dim != 2) { PRINT("ERROR: linear_extrude() is not defined for 3D child objects!"); @@ -357,7 +357,7 @@ PolySet *PolySetCGALEvaluator::evaluatePolySet(const RotateExtrudeNode &node) // to a single DxfData, then tesselate this into a PolySet CGAL_Nef_polyhedron sum; BOOST_FOREACH (AbstractNode * v, node.getChildren()) { - if (v->modinst->tag_background) continue; + if (v->modinst->isBackground()) continue; CGAL_Nef_polyhedron N = this->cgalevaluator.evaluateCGALMesh(*v); if (N.dim != 2) { PRINT("ERROR: rotate_extrude() is not defined for 3D child objects!"); |