diff options
| author | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-01-17 14:58:54 (GMT) |
| commit | 0b1029ff4d6f17a9f397adbf3f0a011cc20d76a5 (patch) | |
| tree | e59dc3c1f4068bb748ebedde54c935a5ab3ef9ca /src/CGAL_Nef_polyhedron.cc | |
| parent | 8dfc6d71cae370a84e50f4cc7624c05c859a4cea (diff) | |
| parent | 20280e88cacc8935de139cd2ce46836beda87e0b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/CGAL_Nef_polyhedron.cc')
| -rw-r--r-- | src/CGAL_Nef_polyhedron.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc index ad2e4e2..8906595 100644 --- a/src/CGAL_Nef_polyhedron.cc +++ b/src/CGAL_Nef_polyhedron.cc @@ -61,7 +61,7 @@ CGAL_Nef_polyhedron &CGAL_Nef_polyhedron::minkowski(const CGAL_Nef_polyhedron &o int CGAL_Nef_polyhedron::weight() const { - if (this->empty()) return 0; + if (this->isNull()) return 0; size_t memsize = sizeof(CGAL_Nef_polyhedron); if (this->dim == 2) { @@ -84,8 +84,7 @@ int CGAL_Nef_polyhedron::weight() const */ PolySet *CGAL_Nef_polyhedron::convertToPolyset() { - if (this->empty()) - return new PolySet(); + if (this->isNull()) return new PolySet(); PolySet *ps = NULL; if (this->dim == 2) { ps = new PolySet(); |