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

export-menu
Marius Kintel 2014-01-04 18:07:51 -05:00
commit 9a1bd74af3
2 changed files with 4 additions and 3 deletions

View File

@ -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

View File

@ -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);
}