Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels

src/slic3r/GUI/BitmapCache.hpp

@@ -1,6 +1,8 @@
 #ifndef SLIC3R_GUI_BITMAP_CACHE_HPP
 #define SLIC3R_GUI_BITMAP_CACHE_HPP
 
+#include <map>
+
 #include <wx/wxprec.h>
 #ifndef WX_PRECOMP
     #include <wx/wx.h>

src/slic3r/GUI/GLCanvas3DManager.cpp

@@ -10,6 +10,7 @@
 
 #include <wx/glcanvas.h>
 #include <wx/timer.h>
+#include <wx/msgdlg.h>
 
 #include <vector>
 #include <string>

src/slic3r/GUI/GUI_ObjectList.hpp

@@ -3,6 +3,7 @@
 
 #include <map>
 #include <vector>
+#include <set>
 
 #include <wx/bitmap.h>
 #include <wx/dataview.h>