Merge branch 'dev' into lm_sla_supports_ui

2018-09-14 11:38:51 +02:00
parent d9322dad95 3903ca64d7
commit 5df70752c0
32 changed files with 1433 additions and 600 deletions
--- a/xs/src/slic3r/GUI/GLGizmo.hpp
+++ b/xs/src/slic3r/GUI/GLGizmo.hpp
@@ -235,6 +235,7 @@ protected:
 class GLGizmoScale3D : public GLGizmoBase
 {
    static const float Offset;
+    static const Vec3d OffsetVec;

    mutable BoundingBoxf3 m_box;