From a492360d198e5cee4bea21e6d1c44386ec3824a5 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Mon, 15 Jul 2019 11:59:54 +0200 Subject: [PATCH] Fix of the merge - missing Undo / Redo toolbar buttons. --- src/slic3r/GUI/GLCanvas3D.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index c2948c2626..a878527bbc 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3647,9 +3647,7 @@ bool GLCanvas3D::_init_toolbar() return false; item.name = "undo"; -#if ENABLE_SVG_ICONS item.icon_filename = "undo_toolbar.svg"; -#endif // ENABLE_SVG_ICONS item.tooltip = _utf8(L("Undo")) + " [" + GUI::shortkey_ctrl_prefix() + "Z]"; item.sprite_id = 11; item.left.toggable = false; @@ -3663,9 +3661,7 @@ bool GLCanvas3D::_init_toolbar() return false; item.name = "redo"; -#if ENABLE_SVG_ICONS item.icon_filename = "redo_toolbar.svg"; -#endif // ENABLE_SVG_ICONS item.tooltip = _utf8(L("Redo")) + " [" + GUI::shortkey_ctrl_prefix() + "Y]"; item.sprite_id = 12; item.left.action_callback = [this]() { post_event(SimpleEvent(EVT_GLCANVAS_REDO)); };