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

2018-07-24 11:20:02 +02:00
parent c68bcb9e60 dfb70ec6e6
commit 8bf3e63f75
24 changed files with 93 additions and 76 deletions
--- a/xs/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/xs/src/slic3r/GUI/GLCanvas3D.cpp
@@ -1883,9 +1883,11 @@ void GLCanvas3D::update_volumes_selection(const std::vector<int>& selections)
    }
 }

-bool GLCanvas3D::check_volumes_outside_state(const DynamicPrintConfig* config) const
+int GLCanvas3D::check_volumes_outside_state(const DynamicPrintConfig* config) const
 {
-    return m_volumes.check_outside_state(config, nullptr);
+    ModelInstance::EPrintVolumeState state;
+    m_volumes.check_outside_state(config, &state);
+    return (int)state;
 }

 bool GLCanvas3D::move_volume_up(unsigned int id)