diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-02-02 19:43:59 (GMT) |
| commit | 18e3a7d9ad8e052d626ac250a9c9d5f36f29a54d (patch) | |
| tree | 565c87e051833daa1c0eed7ffe45533fcf05c2fb /src/openscad.cc | |
| parent | 61fffc0e5b92c9bda7e376983fdc90b498eed745 (diff) | |
| parent | eb30d42b5dd3ed5bb37336ed46a59eabaca81e06 (diff) | |
Merge branch 'master' of github.com:openscad/openscad into misc_updates
Conflicts:
scripts/uni-build-dependencies.sh
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) { |