diff options
| author | Marius Kintel <marius@kintel.net> | 2014-01-04 23:07:51 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-01-04 23:07:51 (GMT) |
| commit | 9a1bd74af3bea6d2849ca303f5a7bb004e74d2b4 (patch) | |
| tree | 09aabbe6586cf06987320b7436d343e6a7937785 | |
| parent | 3b78ba1a581683b0198ceac566e5e606ad09ba88 (diff) | |
| parent | 70026aa0b8dd2e918c17a5783ea1c02dd1d1e01b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rwxr-xr-x | scripts/uni-get-dependencies.sh | 3 | ||||
| -rw-r--r-- | src/CGALEvaluator.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh index d2408c0..048edb8 100755 --- a/scripts/uni-get-dependencies.sh +++ b/scripts/uni-get-dependencies.sh @@ -65,7 +65,6 @@ get_debian_deps() done } - unknown() { echo "Unknown system type. Please install the dependency packages listed" @@ -77,6 +76,8 @@ if [ -e /etc/issue ]; then get_debian_deps elif [ "`grep -i debian /etc/issue`" ]; then get_debian_deps + elif [ "`grep -i raspbian /etc/issue`" ]; then + get_debian_deps elif [ "`grep -i mint /etc/issue`" ]; then get_debian_deps elif [ "`grep -i suse /etc/issue`" ]; then diff --git a/src/CGALEvaluator.cc b/src/CGALEvaluator.cc index 20c5d5e..37d4fd8 100644 --- a/src/CGALEvaluator.cc +++ b/src/CGALEvaluator.cc @@ -708,7 +708,7 @@ CGAL_Nef_polyhedron CGALEvaluator::evaluateCGALMesh(const PolySet &ps) PRINTB("Alternate construction failed. CGAL error in CGAL_Nef_polyhedron3(): %s", e.what()); } CGAL::set_error_behaviour(old_behaviour); - return CGAL_Nef_polyhedron(N); + if (N) return CGAL_Nef_polyhedron(N); } - return CGAL_Nef_polyhedron(); + return CGAL_Nef_polyhedron(ps.is2d?2:3); } |