Clifford Wolf:

	Added CGAL Nef Polyhedron 2D/3D abstraction



git-svn-id: http://svn.clifford.at/openscad/trunk@187 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 12 insertions, 5 deletions

diff --git a/module.cc b/module.cc
index 6e89e18..4a0b703 100644
--- a/module.cc
+++ b/module.cc
@@ -248,14 +248,21 @@ static CGAL_Nef_polyhedron render_cgal_nef_polyhedron_backend(const AbstractNode
 			continue;
 		if (is_first)
 			N = v->render_cgal_nef_polyhedron();
-		else if (intersect)
-			N *= v->render_cgal_nef_polyhedron();
-		else
-			N += v->render_cgal_nef_polyhedron();
+		else if (N.dim == 2) {
+			if (intersect)
+				N.p2 *= v->render_cgal_nef_polyhedron().p2;
+			else
+				N.p2 += v->render_cgal_nef_polyhedron().p2;
+		} else {
+			if (intersect)
+				N.p3 *= v->render_cgal_nef_polyhedron().p3;
+			else
+				N.p3 += v->render_cgal_nef_polyhedron().p3;
+		}
 		is_first = false;
 	}
 
-	that->cgal_nef_cache.insert(cache_id, new CGAL_Nef_polyhedron(N), N.number_of_vertices());
+	that->cgal_nef_cache.insert(cache_id, new CGAL_Nef_polyhedron(N), N.weight());
 	that->progress_report();
 	return N;
 }