diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-09-17 21:13:37 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-09-17 21:13:37 (GMT) |
| commit | 6d70855a4d92a7aafbc21fdd97c570e9ef227182 (patch) | |
| tree | cf5c3ff4d89e8e6aa5863c7c2fe2035981bc0929 /src/openscad.cc | |
| parent | 78bf15d0858ca6ed892872d1cd08c9ef4b8ae63b (diff) | |
added png and image comparison, enabling testing on linux
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 203706d..fd74de4 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -317,15 +317,6 @@ 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"); @@ -344,7 +335,6 @@ int main(int argc, char **argv) fstream.close(); } } ->>>>>>> upstream/visitor if (off_output_file) { if (root_N.dim != 3) { @@ -425,3 +415,4 @@ int main(int argc, char **argv) return rc; } + |