Merge remote branch 'upstream/master' into cakebaby

Conflicts:
	doc/testing.txt
	tests/CMakeLists.txt
	tests/system-gl.cc
	tests/system-gl.h

1 files changed, 23 insertions, 0 deletions

diff --git a/src/CGAL_Nef_polyhedron.cc b/src/CGAL_Nef_polyhedron.cc
index 2538b64..61ca2f8 100644
--- a/src/CGAL_Nef_polyhedron.cc
+++ b/src/CGAL_Nef_polyhedron.cc
@@ -7,6 +7,29 @@
 #include "dxftess.h"
 #include <CGAL/minkowski_sum_3.h>
 
+CGAL_Nef_polyhedron::CGAL_Nef_polyhedron(CGAL_Nef_polyhedron2 *p)
+{
+	if (p) {
+		dim = 2;
+		p2.reset(p);
+	}
+	else {
+		dim = 0;
+	}
+}
+
+CGAL_Nef_polyhedron::CGAL_Nef_polyhedron(CGAL_Nef_polyhedron3 *p)
+{
+	if (p) {
+		dim = 3;
+		p3.reset(p);
+	}
+	else {
+		dim = 0;
+	}
+}
+
+
 CGAL_Nef_polyhedron& CGAL_Nef_polyhedron::operator+=(const CGAL_Nef_polyhedron &other)
 {
 	if (this->dim == 2) (*this->p2) += (*other.p2);