Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons

2019-02-25 09:32:02 +01:00
parent 03022ce124 b4a61a3acb
commit fab87ff1d9
42 changed files with 314 additions and 203 deletions
--- a/src/slic3r/GUI/GLGizmo.hpp
+++ b/src/slic3r/GUI/GLGizmo.hpp
@@ -401,7 +401,7 @@ private:

    // This holds information to decide whether recalculation is necessary:
    std::vector<Transform3d> m_volumes_matrices;
-    std::vector<ModelVolume::Type> m_volumes_types;
+    std::vector<ModelVolumeType> m_volumes_types;
    Vec3d m_first_instance_scale;
    Vec3d m_first_instance_mirror;