diff options
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index fd74de4..203706d 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -317,6 +317,15 @@ int main(int argc, char **argv) } } +<<<<<<< HEAD + if (root_N.dim == 3 && !root_N.p3.is_simple()) { + fprintf(stderr, "Object isn't a valid 2-manifold! Modify your design.\n"); + exit(1); + } + + if (stl_output_file) + export_stl(&root_N, stl_output_file, NULL); +======= if (stl_output_file) { if (root_N.dim != 3) { fprintf(stderr, "Current top level object is not a 3D object.\n"); @@ -335,6 +344,7 @@ int main(int argc, char **argv) fstream.close(); } } +>>>>>>> upstream/visitor if (off_output_file) { if (root_N.dim != 3) { @@ -415,4 +425,3 @@ int main(int argc, char **argv) return rc; } - |