diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-26 15:37:00 (GMT) |
| commit | cbabbaed700536b3a1f513fd5a07d25382cb137f (patch) | |
| tree | 17478b52e8e8205709c6862b605caf6762445dfa /src/CGALEvaluator.cc | |
| parent | 312a25f2708fcef22e300f7bd2c1aaed61d3095d (diff) | |
| parent | 4ff2d1af446c1f276c644b12e6ec4cc6db0b6d65 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
openscad.pro
src/module.h
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 5384cf7..a54fe02 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -98,7 +98,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 @@ -126,7 +126,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; } |