Fixed conflicts after merge with master

2020-04-02 12:29:30 +02:00
parent 956f7a4593 b578b7ec87
commit ab1e90ec0d
33 changed files with 688 additions and 544 deletions
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -16,6 +16,9 @@
 #include "GUI_ObjectLayers.hpp"
 #include "GLSelectionRectangle.hpp"
 #include "MeshUtils.hpp"
+#if !ENABLE_NON_STATIC_CANVAS_MANAGER
+#include "Camera.hpp"
+#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER
 #if ENABLE_GCODE_VIEWER
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #endif // ENABLE_GCODE_VIEWER