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

2020-03-25 09:34:17 +01:00
parent 3990598f01 ece0d4ca18
commit fac28ea27a
48 changed files with 98 additions and 351 deletions
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -8,8 +8,9 @@
 #include "slic3r/Utils/UndoRedo.hpp"
 #include "libslic3r/SLAPrint.hpp"
 #include "slic3r/GUI/MeshUtils.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmos.hpp"
+#include "slic3r/GUI/Camera.hpp"

-#include <GL/glew.h>
 #include <wx/glcanvas.h>

 namespace Slic3r {