diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-31 03:26:53 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-31 03:26:53 (GMT) |
| commit | 44bb37fdee6683e1f56d1983f3c53c98b6e3318a (patch) | |
| tree | 521c0f50b5785b439411ac3f1c8df1ec8cca4cf9 | |
| parent | 85378e44367a62116e8067105f0fe862a932ba8f (diff) | |
move 'delete root_node' where it was before merging master. cleanup
| -rw-r--r-- | src/OffscreenContextWGL.cc | 2 | ||||
| -rw-r--r-- | src/export_png.cc | 3 | ||||
| -rw-r--r-- | src/openscad.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/OffscreenContextWGL.cc b/src/OffscreenContextWGL.cc index b8e1481..4fe4c65 100644 --- a/src/OffscreenContextWGL.cc +++ b/src/OffscreenContextWGL.cc @@ -195,9 +195,11 @@ bool teardown_offscreen_context(OffscreenContext *ctx) if (ctx) { fbo_unbind(ctx->fbo); fbo_delete(ctx->fbo); + wglMakeCurrent( NULL, NULL ); wglDeleteContext( ctx->openGLContext ); ReleaseDC( ctx->window, ctx->dev_context ); + return true; } return false; diff --git a/src/export_png.cc b/src/export_png.cc index 7c62cea..e877b14 100644 --- a/src/export_png.cc +++ b/src/export_png.cc @@ -49,8 +49,7 @@ void export_png_with_cgal(CGAL_Nef_polyhedron *root_N, std::ostream &output) void export_png_with_opencsg(CGAL_Nef_polyhedron *root_N, std::ostream &output) { CsgInfo csgInfo; - output << "solid OpenSCAD_Model opencsg\n"; - output << "endsolid OpenSCAD_Model opencsg\n"; + output << "not implemented: solid OpenSCAD_Model opencsg png export\n"; } diff --git a/src/openscad.cc b/src/openscad.cc index 7ebad33..5caef88 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -400,11 +400,11 @@ int main(int argc, char **argv) } } } - delete root_node; #else fprintf(stderr, "OpenSCAD has been compiled without CGAL support!\n"); exit(1); #endif + delete root_node; } else if (useGUI) { |