Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets

2018-08-16 08:56:18 +02:00
parent 93ce0d23b7 4d98d32199
commit 3f72ca2a15
17 changed files with 266 additions and 183 deletions
--- a/xs/src/slic3r/GUI/GLGizmo.hpp
+++ b/xs/src/slic3r/GUI/GLGizmo.hpp
@@ -101,7 +101,7 @@ class GLGizmoRotate : public GLGizmoBase

    mutable Pointf m_center;
    mutable float m_radius;
-    mutable bool m_keep_radius;
+    mutable bool m_keep_initial_values;

 public:
    GLGizmoRotate();