diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-12 22:31:02 (GMT) |
| commit | 133a705feef86f11d5afc7fb69ed30585db9e533 (patch) | |
| tree | f886e81c8853cdc1b26f557ad435e78c3c347a6b /src/openscad.cc | |
| parent | eb79c56ece95f5508e9ee12326995a84a1f9a5f2 (diff) | |
| parent | b927e9e1511ca655b4c15b003343ddffc08b0938 (diff) | |
merging
Merge remote branch 'upstream/master' into visitortests
Conflicts:
src/cgaladv.cc
src/export.cc
src/openscad.cc
src/polyset.cc
src/transform.cc
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 f3aee76..3258820 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -333,6 +333,7 @@ int main(int argc, char **argv) fclose(fp); } +<<<<<<< HEAD if (stl_output_file) { QFile file(stl_output_file); if (!file.open(QIODevice::ReadWrite)) { @@ -344,6 +345,15 @@ int main(int argc, char **argv) file.close(); } } +======= + 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); +>>>>>>> upstream/master if (off_output_file) { QFile file(stl_output_file); @@ -418,4 +428,3 @@ int main(int argc, char **argv) return rc; } - |