diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-06 04:27:12 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-06 04:27:12 (GMT) |
| commit | f70578f362c8c2c78036c9de846c20802ac7aa81 (patch) | |
| tree | f327de271f14382c0915677a87e53867785551f7 /src/openscad.cc | |
| parent | 32469374cfe2985f936f017a204d4e9d7dcd3e2f (diff) | |
| parent | 03be37d16b585e64de87118053206aaae06e7cf8 (diff) | |
Merge branch 'master' into epec-kernel
Diffstat (limited to 'src/openscad.cc')
| -rw-r--r-- | src/openscad.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/openscad.cc b/src/openscad.cc index 472b5d4..880aa0d 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -255,7 +255,6 @@ int main(int argc, char **argv) if (!filename) help(argv[0]); -#ifdef ENABLE_CGAL Context root_ctx; register_builtin(root_ctx); @@ -299,6 +298,7 @@ int main(int argc, char **argv) } } else { +#ifdef ENABLE_CGAL CGAL_Nef_polyhedron root_N = cgalevaluator.evaluateCGALMesh(*tree.root()); fs::current_path(original_path); @@ -373,12 +373,12 @@ int main(int argc, char **argv) fstream.close(); } } - } - delete root_node; #else - fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); - exit(1); + fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); + exit(1); #endif + } + delete root_node; } else if (useGUI) { |