From 3e21f0cc91c00d018a4ad869f052c1b94ea589d7 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 1 Nov 2022 10:18:56 +0800 Subject: [PATCH] FIX:keep all three import methods consistent Change-Id: I82fe0b8ec2df2092b35119c021d6dff2575720ae --- src/slic3r/GUI/MainFrame.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 3d4ce4eff..1fdf419db 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1977,7 +1977,7 @@ void MainFrame::init_menubar_as_editor() #ifndef __APPLE__ append_menu_item(import_menu, wxID_ANY, _L("Import 3MF/STL/STEP/OBJ/AMF") + dots + "\tCtrl+I", _L("Load a model"), [this](wxCommandEvent&) { if (m_plater) { - m_plater->add_model(); + m_plater->add_file(); } }, "menu_import", nullptr, [this](){return can_add_models(); }, this); #else diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a2baf8c69..6b645c7fa 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -5614,9 +5614,9 @@ void Plater::priv::on_process_completed(SlicingProcessCompletedEvent &evt) void Plater::priv::on_action_add(SimpleEvent&) { if (q != nullptr) { - q->add_model(); + //q->add_model(); //BBS open file in toolbar add - //q->add_file(); + q->add_file(); } }