3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-22 08:11:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into tm_colldetection_upgr

Browse source
This commit is contained in:
tamasmeszaros 2019-03-08 11:40:15 +01:00
commit 37eafb0761
6 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1145,8 +1145,11 @@ bool GLCanvas3D::Selection::is_single_full_instance() const
for (unsigned int i : m_list)
{
const GLVolume* v = (*m_volumes)[i];
if ((object_idx != v->object_idx()) || (instance_idx != v->instance_idx()))
return false;
int volume_idx = v->volume_idx();
if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx) && (volume_idx >= 0))
if (volume_idx >= 0)
volumes_idxs.insert(volume_idx);
}
@ -5498,7 +5501,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
{
// the gizmo got the event and took some action, no need to do anything more
}
else if ((m_mouse.drag.move_volume_idx != -1) && m_mouse.dragging)
else if ((m_mouse.drag.move_volume_idx != -1) && m_mouse.dragging && m_gizmos.get_current_type() != Gizmos::SlaSupports)
{
m_regenerate_volumes = false;
do_move();