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

2020-05-27 14:29:54 +02:00
parent a0acf24ab8 d9b764bd10
commit 448d92df68
51 changed files with 313 additions and 332 deletions
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -5,7 +5,6 @@
 #include <memory>
 #include <chrono>

-#include "3DScene.hpp"
 #include "GLToolbar.hpp"
 #include "Event.hpp"
 #include "Selection.hpp"