Merge remote-tracking branch 'origin/master' into ys_search

2020-04-01 20:23:34 +02:00
parent 67c55c7490 815989d488
commit 5f31d9ed41
31 changed files with 680 additions and 543 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

 #include <float.h>