fixed merge conflict

stl_dim
Marius Kintel 2011-09-08 03:39:14 +02:00
parent f40daab2d1
commit c398bc7e3d
1 changed files with 2 additions and 2 deletions

View File

@ -319,7 +319,7 @@ int main(int argc, char **argv)
}
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");
exit(1);
}
@ -334,7 +334,7 @@ int main(int argc, char **argv)
}
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");
exit(1);
}