mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: keep change filament menu item followed by convert menu item 

Change-Id: I460b01078ae5cde22afe30b4a7ac13cdd9e67b26
(cherry picked from commit e37460eb4a30db3449132e36df97ea613eebf41d)
This commit is contained in:
liz.li 2023-05-17 09:34:48 +08:00 committed by Lane.Wei
parent 7af252fa99
commit 5236f17792
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI_Factories.cpp
View File

@ -1259,10 +1259,10 @@ wxMenu* MenuFactory::default_menu()
wxMenu* MenuFactory::object_menu() wxMenu* MenuFactory::object_menu()
{ {
append_menu_item_change_filament(&m_object_menu);
append_menu_items_convert_unit(&m_object_menu); append_menu_items_convert_unit(&m_object_menu);
append_menu_items_flush_options(&m_object_menu); append_menu_items_flush_options(&m_object_menu);
append_menu_item_invalidate_cut_info(&m_object_menu); append_menu_item_invalidate_cut_info(&m_object_menu);
append_menu_item_change_filament(&m_object_menu);
return &m_object_menu; return &m_object_menu;
} }
@ -1322,13 +1322,13 @@ wxMenu* MenuFactory::multi_selection_menu()
//append_menu_item_simplify(menu); //append_menu_item_simplify(menu);
append_menu_item_delete(menu); append_menu_item_delete(menu);
menu->AppendSeparator(); menu->AppendSeparator();
//BBS
append_menu_item_change_filament(menu);
append_menu_item_set_printable(menu); append_menu_item_set_printable(menu);
append_menu_item_per_object_process(menu); append_menu_item_per_object_process(menu);
menu->AppendSeparator(); menu->AppendSeparator();
append_menu_items_convert_unit(menu); append_menu_items_convert_unit(menu);
//BBS
append_menu_item_change_filament(menu);
menu->AppendSeparator(); menu->AppendSeparator();
append_menu_item_export_stl(menu, true); append_menu_item_export_stl(menu, true);
} }
@ -1338,6 +1338,7 @@ wxMenu* MenuFactory::multi_selection_menu()
//append_menu_item_simplify(menu); //append_menu_item_simplify(menu);
append_menu_item_delete(menu); append_menu_item_delete(menu);
append_menu_items_convert_unit(menu); append_menu_items_convert_unit(menu);
append_menu_item_change_filament(menu);
wxMenu* split_menu = new wxMenu(); wxMenu* split_menu = new wxMenu();
if (split_menu) { if (split_menu) {
append_menu_item(split_menu, wxID_ANY, _L("To objects"), _L("Split the selected object into multiple objects"), append_menu_item(split_menu, wxID_ANY, _L("To objects"), _L("Split the selected object into multiple objects"),
@ -1350,8 +1351,6 @@ wxMenu* MenuFactory::multi_selection_menu()
append_submenu(menu, split_menu, wxID_ANY, _L("Split"), _L("Split the selected object"), "", append_submenu(menu, split_menu, wxID_ANY, _L("Split"), _L("Split the selected object"), "",
[]() { return plater()->can_split(true); }, m_parent); []() { return plater()->can_split(true); }, m_parent);
} }
menu->AppendSeparator();
append_menu_item_change_filament(menu);
} }
return menu; return menu;
} }