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/CGALEvaluator.cc | |
| parent | c4bffdaf37fdf72a84a225ec584d3698fe398857 (diff) | |
| parent | 4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff) | |
Merge branch 'master' into color-priority
Conflicts:
openscad.pro
Diffstat (limited to 'src/CGALEvaluator.cc')
| -rw-r--r-- | src/CGALEvaluator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index 684ab42..a6b2f06 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -99,7 +99,7 @@ CGAL_Nef_polyhedron CGALEvaluator::applyToChildren(const AbstractNode &node, CGA const AbstractNode *chnode = item.first; const CGAL_Nef_polyhedron &chN = item.second; // FIXME: Don't use deep access to modinst members - if (chnode->modinst->tag_background) continue; + if (chnode->modinst->isBackground()) continue; // NB! We insert into the cache here to ensure that all children of // a node is a valid object. If we inserted as we created them, the @@ -127,7 +127,7 @@ CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node) const AbstractNode *chnode = item.first; const CGAL_Nef_polyhedron &chN = item.second; // FIXME: Don't use deep access to modinst members - if (chnode->modinst->tag_background) continue; + if (chnode->modinst->isBackground()) continue; if (dim == 0) { dim = chN.dim; } |