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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse source
This commit is contained in:
enricoturri1966 2020-08-21 11:10:27 +02:00
commit 34759f9a70
5 changed files with 126 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3758,6 +3758,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
{
m_mouse.dragging = true;
// Translation of objects is forbidden when SLA supports/hollowing/fdm
// supports gizmo is active.
if (m_gizmos.get_current_type() == GLGizmosManager::SlaSupports
|| m_gizmos.get_current_type() == GLGizmosManager::FdmSupports
|| m_gizmos.get_current_type() == GLGizmosManager::Hollow)
return;
Vec3d cur_pos = m_mouse.drag.start_position_3D;
// we do not want to translate objects if the user just clicked on an object while pressing shift to remove it from the selection and then drag
if (m_selection.contains_volume(get_first_hover_volume_idx()))