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

Merge remote-tracking branch 'remotes/origin/vb_undo_redo'

Browse source
This commit is contained in:
bubnikv 2019-07-15 11:34:18 +02:00
commit ab7ecc1819
60 changed files with 2799 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View file

@ -542,8 +542,7 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt, GLCanvas3D& canvas)
if (m_current == Flatten)
{
// Rotate the object so the normal points downward:
selection.flattening_rotate(get_flattening_normal());
canvas.do_flatten();
canvas.do_flatten(get_flattening_normal(), "Place on Face");
wxGetApp().obj_manipul()->set_dirty();
}
@ -616,17 +615,17 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt, GLCanvas3D& canvas)
case Move:
{
canvas.disable_regenerate_volumes();
canvas.do_move();
canvas.do_move("Gizmo-Move Object");
break;
}
case Scale:
{
canvas.do_scale();
canvas.do_scale("Gizmo-Scale Object");
break;
}
case Rotate:
{
canvas.do_rotate();
canvas.do_rotate("Gizmo-Rotate Object");
break;
}
default: