diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-27 15:15:19 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-27 15:15:19 (GMT) |
| commit | 1a02158ddc6d2b52a43c2a0ee9b1bc79e5461f1e (patch) | |
| tree | 09c2947b5a1bbec67e6261bf2ea17e7c2680be2a | |
| parent | 67eeed386cab529da187f4d8a94573df8a6768ae (diff) | |
| parent | 8e9b2d2c491ccafd5cb14919f750aa537ebdcc04 (diff) | |
Merge pull request #150 from openscad/issue148
Issue148
| -rw-r--r-- | src/CGALEvaluator.cc | 4 | ||||
| -rw-r--r-- | src/CGAL_Nef_polyhedron.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index a570df4..1b307be 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -253,7 +253,7 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node) testmat << node.matrix(0,0), node.matrix(0,1), node.matrix(1,0), node.matrix(1,1); if (testmat.determinant() == 0) { PRINT("Warning: Scaling a 2D object with 0 - removing object"); - N.p2.reset(); + N.reset(); } else { CGAL_Aff_transformation2 t( @@ -279,7 +279,7 @@ Response CGALEvaluator::visit(State &state, const TransformNode &node) else if (N.dim == 3) { if (node.matrix.matrix().determinant() == 0) { PRINT("Warning: Scaling a 3D object with 0 - removing object"); - N.p3.reset(); + N.reset(); } else { CGAL_Aff_transformation t( diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h index 0b0784e..694b420 100644 --- a/src/CGAL_Nef_polyhedron.h +++ b/src/CGAL_Nef_polyhedron.h @@ -14,6 +14,7 @@ public: ~CGAL_Nef_polyhedron() {} bool empty() const { return (dim == 0 || (!p2 && !p3)); } + void reset() { dim=0; p2.reset(); p3.reset(); } CGAL_Nef_polyhedron &operator+=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator*=(const CGAL_Nef_polyhedron &other); CGAL_Nef_polyhedron &operator-=(const CGAL_Nef_polyhedron &other); |