Merge branch 'dev2' of https://github.com/prusa3d/Slic3r into dev_native

2018-10-03 13:38:57 +02:00 · 2018-10-03 13:38:57 +02:00 · 2d77d51f84
commit 2d77d51f84
parent 770d944283 025fdc1359
3 changed files with 9 additions and 0 deletions
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@ -1004,6 +1004,11 @@ const TriangleMesh& ModelVolume::get_convex_hull() const
    return m_convex_hull;
 }

+TriangleMesh& ModelVolume::get_convex_hull()
+{
+    return m_convex_hull;
+}
+
 ModelVolume::Type ModelVolume::type_from_string(const std::string &s)
 {
    // Legacy support