Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 4 deletions

diff --git a/src/openscad.cc b/src/openscad.cc
index 84d6263..678d87a 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -101,8 +101,7 @@ int main(int argc, char **argv)
 	// (which we don't catch). This gives us stack traces without rerunning in gdb.
 	CGAL::set_error_behaviour(CGAL::ABORT);
 #endif
-	initialize_builtin_functions();
-	initialize_builtin_modules();
+	Builtins::instance()->initialize();
 
 #ifdef Q_WS_X11
 	// see <http://qt.nokia.com/doc/4.5/qapplication.html#QApplication-2>:
@@ -124,6 +123,7 @@ int main(int argc, char **argv)
 	QCoreApplication::setOrganizationName("OpenSCAD");
 	QCoreApplication::setOrganizationDomain("openscad.org");
 	QCoreApplication::setApplicationName("OpenSCAD");
+	QCoreApplication::setApplicationVersion(TOSTRING(OPENSCAD_VERSION));
 
 	const char *filename = NULL;
 	const char *output_file = NULL;
@@ -408,8 +408,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	destroy_builtin_functions();
-	destroy_builtin_modules();
+	Builtins::instance(true);
 
 	return rc;
 }