Clifford Wolf:

	Fixed OpenGL viewport init
	Added sphere primitive
	Fixed building without OpenCSG



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

1 files changed, 0 insertions, 6 deletions

diff --git a/csg.cc b/csg.cc
index bc57d75..57899e9 100644
--- a/csg.cc
+++ b/csg.cc
@@ -44,9 +44,7 @@ public:
 #ifdef ENABLE_CGAL
         virtual CGAL_Nef_polyhedron render_cgal_nef_polyhedron() const;
 #endif
-#ifdef ENABLE_OPENCSG
 	CSGTerm *render_csg_term(double m[16]) const;
-#endif
         virtual QString dump(QString indent) const;
 };
 
@@ -85,8 +83,6 @@ CGAL_Nef_polyhedron CsgNode::render_cgal_nef_polyhedron() const
 
 #endif /* ENABLE_CGAL */
 
-#ifdef ENABLE_OPENCSG
-
 CSGTerm *CsgNode::render_csg_term(double m[16]) const
 {
 	CSGTerm *t1 = NULL;
@@ -107,8 +103,6 @@ CSGTerm *CsgNode::render_csg_term(double m[16]) const
 	return t1;
 }
 
-#endif /* ENABLE_OPENCSG */
-
 QString CsgNode::dump(QString indent) const
 {
 	QString text = indent + QString("n%1: ").arg(idx);