From c398bc7e3d5eca8240bfd1d16fab88f33aec1cfe Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Thu, 8 Sep 2011 03:39:14 +0200
Subject: fixed merge conflict


diff --git a/src/openscad.cc b/src/openscad.cc
index c4b0d5f..f7db633 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -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);
 			}
-- 
cgit v0.10.1