Merge branch 'master' of github.com:openscad/openscad into issue158

6 files changed, 13 insertions, 8 deletions

diff --git a/doc/checklist-macosx.txt b/doc/checklist-macosx.txt
index ff1c7ea..a72a8d3 100644
--- a/doc/checklist-macosx.txt
+++ b/doc/checklist-macosx.txt
@@ -3,8 +3,8 @@ NB! This is the Mac OS X deployment checklist.
     OpenSCAD for your system only without manually compiling all
     dependencies.
 
-o MacPorts libs
-  port install eigen
+o Macports:
+  sudo port install cmake ImageMagick
 
 o Qt4
   - Download and install the combined 32-bit and 64-bit build for 10.5-10.6 from here:
diff --git a/patches/OpenCSG-1.3.2-MacOSX-port.patch b/patches/OpenCSG-1.3.2-MacOSX-port.patch
index ba4bcc4..7262307 100644
--- a/patches/OpenCSG-1.3.2-MacOSX-port.patch
+++ b/patches/OpenCSG-1.3.2-MacOSX-port.patch
@@ -34,7 +34,7 @@ diff --git a/src/src.pro b/src/src.pro
 index 4843a12..04d3f4d 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -1,10 +1,31 @@
+@@ -1,10 +1,32 @@
  TEMPLATE	= lib
  TARGET		= opencsg
  VERSION     = 1.3.2
@@ -43,6 +43,7 @@ index 4843a12..04d3f4d 100644
  CONFIG		+= opengl warn_on release
 -INCLUDEPATH += ../include ../glew/include ../
 +INCLUDEPATH += ../include ../
++CONFIG -= qt
 +
 +# Optionally specify deployment location using the 
 +# OPENSCAD_LIBRARIES env. variable
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh
index 0ce9908..f7b6b18 100755
--- a/scripts/macosx-build-dependencies.sh
+++ b/scripts/macosx-build-dependencies.sh
@@ -200,8 +200,9 @@ build_cgal()
   cd $BASEDIR/src
   rm -rf CGAL-$version
   if [ ! -f CGAL-$version.tar.gz ]; then
-    #4.0
-    curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
+      # 4.0.2
+      curl -O https://gforge.inria.fr/frs/download.php/31175/CGAL-$version.tar.gz
+    # 4.0 curl -O https://gforge.inria.fr/frs/download.php/30387/CGAL-$version.tar.gz
     # 3.9 curl -O https://gforge.inria.fr/frs/download.php/29125/CGAL-$version.tar.gz
     # 3.8 curl -O https://gforge.inria.fr/frs/download.php/28500/CGAL-$version.tar.gz
     # 3.7 curl -O https://gforge.inria.fr/frs/download.php/27641/CGAL-$version.tar.gz
@@ -301,6 +302,6 @@ build_gmp 5.0.5
 build_mpfr 3.1.0
 build_boost 1.47.0
 # NB! For CGAL, also update the actual download URL in the function
-build_cgal 4.0
+build_cgal 4.0.2
 build_glew 1.7.0
 build_opencsg 1.3.2
diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc
index a570df4..1b307be 100644
--- a/src/CGALEvaluator.cc
+++ b/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(
diff --git a/src/CGAL_Nef_polyhedron.h b/src/CGAL_Nef_polyhedron.h
index 0b0784e..694b420 100644
--- a/src/CGAL_Nef_polyhedron.h
+++ b/src/CGAL_Nef_polyhedron.h
@@ -14,6 +14,7 @@ public:
 	~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);
diff --git a/src/editor.cc b/src/editor.cc
index bba8d4f..92aeefe 100644
--- a/src/editor.cc
+++ b/src/editor.cc
@@ -104,6 +104,8 @@ void Editor::wheelEvent ( QWheelEvent * event )
 			zoomIn();
 		else if (event->delta() < 0 )
 			zoomOut();
+	} else {
+		QTextEdit::wheelEvent( event );
 	}
 }