fix build

src/noggit/MapView.cpp

@@ -2895,11 +2895,14 @@ MapView::~MapView()
   // when the uid fix fail the UI isn't created
   if (!_uid_fix_failed)
   {
-    //delete objectEditor;
-
+    // delete TexturePicker; // explicitly delete this here to avoid opengl context related crash
+    // delete objectEditor;
     // since the ground effect tool preview renderer got added, this causes crashing on exit to menu. 
     // Now it crashes in application exit.
     // delete texturingTool;
+
+    _tools[static_cast<int>(editing_mode::paint)].reset();
+    _tools[static_cast<int>(editing_mode::object)].reset();
   }
   
   if (_force_uid_check)

src/noggit/Model.cpp

@@ -10,7 +10,8 @@
 #include <opengl/scoped.hpp>
 #include <opengl/shader.hpp>
 #include <external/tracy/Tracy.hpp>
-#include <noggit/application/NoggitApplication.hpp>
+// #include <noggit/application/NoggitApplication.hpp>
+#include <noggit/project/CurrentProject.hpp>
 #include <util/CurrentFunction.hpp>
 
 #include <algorithm>

src/noggit/Model.h

@@ -45,7 +45,7 @@ enum M2Versions
 enum M2GlobalFlags
 {
   m2_flag_tilt_x = 0x1,
-  m2_flag_tilt_x = 0x2,
+  m2_flag_tilt_y = 0x2,
   // m2_flag_unk_0x4 = 0x4,
   m2_flag_use_texture_combiner_combos = 0x8,
   // m2_flag_unk_0x10 = 0x10

src/noggit/ui/windows/noggitWindow/NoggitWindow.cpp

@@ -20,7 +20,6 @@
 #include <noggit/ui/windows/noggitWindow/components/BuildMapListComponent.hpp>
 #include <noggit/application/Utils.hpp>
 #include <noggit/application/NoggitApplication.hpp>
-#include <math/coordinates.hpp>
 #include <BlizzardDatabase.h>
 #include <QtGui/QCloseEvent>
 #include <QtWidgets/QHBoxLayout>