mirror of https://github.com/vitalif/openscad
fixed merge conflict
parent
f40daab2d1
commit
c398bc7e3d
|
@ -319,7 +319,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stl_output_file) {
|
if (stl_output_file) {
|
||||||
if (root_N->dim == 3 && !root_N->p3.is_simple()) {
|
if (root_N.dim == 3 && !root_N.p3->is_simple()) {
|
||||||
fprintf(stderr, "Object isn't a valid 2-manifold! Modify your design.\n");
|
fprintf(stderr, "Object isn't a valid 2-manifold! Modify your design.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
@ -334,7 +334,7 @@ int main(int argc, char **argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (off_output_file) {
|
if (off_output_file) {
|
||||||
if (root_N->dim == 3 && !root_N->p3.is_simple()) {
|
if (root_N.dim == 3 && !root_N.p3->is_simple()) {
|
||||||
fprintf(stderr, "Object isn't a valid 2-manifold! Modify your design.\n");
|
fprintf(stderr, "Object isn't a valid 2-manifold! Modify your design.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue