diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-02-27 12:32:10 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-02-27 12:32:10 +0300 |
| commit | 6066f7b7c5fa01d74ce62dfbb95fdbb5e00398a6 (patch) | |
| tree | f9e6fdf2060dc5cdb099cc63699dc86892a16dec /src | |
| parent | fb91232d104058221776e67df7da5001fed0bc6a (diff) | |
| parent | bb533e386ac8396e0a9ea77dbea8f3b3b7d28f25 (diff) | |
Merge branch 'master' of https://github.com/prusa3d/Slic3r
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index e0f66fb04..4f456c392 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4673,16 +4673,17 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) case 'b': { zoom_to_bed(); break; } case 'I': case 'i': { set_camera_zoom(1.0f); break; } - case 'M': - case 'm': { - if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.mouse_event(SLAGizmoEventType::ManualEditing)) - m_dirty = true; - break; - } case 'O': case 'o': { set_camera_zoom(-1.0f); break; } case 'Z': case 'z': { m_selection.is_empty() ? zoom_to_volumes() : zoom_to_selection(); break; } + case 'M': + case 'm': { + if (m_gizmos.get_current_type() == Gizmos::SlaSupports && m_gizmos.mouse_event(SLAGizmoEventType::ManualEditing)) { + m_dirty = true; + break; + } + } // intentional fallthrough default: { if (m_gizmos.handle_shortcut(keyCode, m_selection)) |