solvespace · May 31, 2019 · May 31, 2019
Showing with 14 additions and 4 deletions.

+1 −1 extlib/q3d

+2 −2 src/export.cpp

+1 −1 src/platform/entrygui.cpp

+1 −0 src/platform/gui.h

+3 −0 src/platform/guigtk.cpp

+2 −0 src/platform/guimac.mm

+2 −0 src/platform/guinone.cpp

+2 −0 src/platform/guiwin.cpp
diff --git a/extlib/q3d b/extlib/q3d
diff --git a/src/export.cpp b/src/export.cpp
@@ -94,7 +94,7 @@ void SolveSpaceUI::ExportSectionTo(const Platform::Path &filename) {
     // Remove all overlapping edges/beziers to merge the areas they describe.
     el.CullExtraneousEdges(/*both=*/true);
     bl.CullIdenticalBeziers(/*both=*/true);
-    
+
     // Collect lines and beziers with custom style & export.
     int i;
     for(i = 0; i < SK.entity.n; i++) {
@@ -900,7 +900,7 @@ void SolveSpaceUI::ExportMeshAsStlTo(FILE *f, SMesh *sm) {
 // Export the mesh as a Q3DO (https://github.com/q3k/q3d) file.
 //-----------------------------------------------------------------------------
 
-#include "object_generated.h"
+#include "q3d_object_generated.h"
 void SolveSpaceUI::ExportMeshAsQ3doTo(FILE *f, SMesh *sm) {
     flatbuffers::FlatBufferBuilder builder(1024);
     double s = SS.exportScale;

diff --git a/src/platform/entrygui.cpp b/src/platform/entrygui.cpp
@@ -29,8 +29,8 @@ int main(int argc, char** argv) {
 
     Platform::Close3DConnexion();
     SS.Clear();
-
     SK.Clear();
+    Platform::ClearGui();
 
     return 0;
 }

diff --git a/src/platform/gui.h b/src/platform/gui.h
@@ -380,6 +380,7 @@ void OpenInBrowser(const std::string &url);
 void InitGui(int argc, char **argv);
 void RunGui();
 void ExitGui();
+void ClearGui();
 
 }
 

diff --git a/src/platform/guigtk.cpp b/src/platform/guigtk.cpp
@@ -1475,6 +1475,9 @@ void RunGui() {
 
 void ExitGui() {
     gtkMain->quit();
+}
+
+void ClearGui() {
     delete gtkMain;
 }
 

diff --git a/src/platform/guimac.mm b/src/platform/guimac.mm
@@ -1479,5 +1479,7 @@ void ExitGui() {
     [NSApp terminate:nil];
 }
 
+void ClearGui() {}
+
 }
 }
diff --git a/src/platform/guinone.cpp b/src/platform/guinone.cpp
@@ -154,6 +154,8 @@ void ExitGui() {
     exit(0);
 }
 
+void ClearGui() {}
+
 }
 
 }
diff --git a/src/platform/guiwin.cpp b/src/platform/guiwin.cpp
@@ -1677,5 +1677,7 @@ void ExitGui() {
     PostQuitMessage(0);
 }
 
+void ClearGui() {}
+
 }
 }
-Original file line number
+Diff line change
@@ @@ -1479,5 +1479,7 @@ void ExitGui() { @@
         [NSApp terminate:nil];
     }
+    void ClearGui() {}
     }
     }