Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master
This commit is contained in:
commit
fbcdd4191b
65 changed files with 6783 additions and 2921 deletions
|
@ -8,6 +8,7 @@
|
|||
#if ENABLE_LEGACY_OPENGL_REMOVAL
|
||||
#include "slic3r/GUI/Plater.hpp"
|
||||
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
|
||||
#include "libslic3r/Model.hpp"
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
|
@ -79,7 +80,8 @@ std::string GLGizmoMove3D::on_get_name() const
|
|||
|
||||
bool GLGizmoMove3D::on_is_activable() const
|
||||
{
|
||||
return !m_parent.get_selection().is_empty();
|
||||
const Selection& selection = m_parent.get_selection();
|
||||
return !selection.is_any_cut_volume() && !selection.is_any_connector() && !selection.is_empty();
|
||||
}
|
||||
|
||||
void GLGizmoMove3D::on_start_dragging()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue