Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'origin/issue148' into lion

  • Loading branch information...
commit 1026be9494abeb02e68f64994dd99ded365e1ccf 2 parents 548a568 + 8e9b2d2
@kintel kintel authored
Showing with 3 additions and 2 deletions.
  1. +2 −2 src/CGALEvaluator.cc
  2. +1 −0  src/CGAL_Nef_polyhedron.h
View
4 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(
View
1  src/CGAL_Nef_polyhedron.h
@@ -14,6 +14,7 @@ class CGAL_Nef_polyhedron
~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);
Please sign in to comment.
Something went wrong with that request. Please try again.