diff options
| author | Marius Kintel <marius@kintel.net> | 2013-01-30 18:31:54 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-01-30 18:31:54 (GMT) |
| commit | 87a2e363b53fc47253312b3496a235016ec00d51 (patch) | |
| tree | 789fa0175ee6aa18787511c2eaf2408d980fcd2f | |
| parent | ced1c377744c6d1efd69f461398658c366eb0cc0 (diff) | |
| parent | 97c8f40200c3b4c753fd8885576d9a86cd2b09ba (diff) | |
Merge pull request #266 from 5263/patch-1
enable csg output when compiled without CGAL
| -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) { |