summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-05-04 23:26:09 (GMT)
committerMarius Kintel <marius@kintel.net>2013-05-04 23:26:09 (GMT)
commite09d1df0e1d304eedba36494535848e64631b22d (patch)
tree8d7524576f1ed7dc1a8b4d5957486fb81a0d6a76 /src
parentffe750d87e747a57f7bf85281b87e4894cbf92b2 (diff)
parentc4cae2a29a7df82f4f1b43543e6b22b642a275b0 (diff)
Merge branch 'master' into local-scope
Diffstat (limited to 'src')
-rw-r--r--src/CGALEvaluator.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc
index 6ad9e4d..d0140fa 100644
--- a/src/CGALEvaluator.cc
+++ b/src/CGALEvaluator.cc
@@ -141,6 +141,9 @@ CGAL_Nef_polyhedron CGALEvaluator::applyHull(const CgaladvNode &node)
PRINT("WARNING: hull() does not support mixing 2D and 3D objects.");
continue;
}
+ if (chN.isNull()) { // If one of the children evaluated to a null object
+ continue;
+ }
if (dim == 2) {
CGAL_Nef_polyhedron2::Explorer explorer = chN.p2->explorer();
BOOST_FOREACH(const CGAL_Nef_polyhedron2::Explorer::Vertex &vh,
contact: Jan Huwald // Impressum