mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-18 02:52:10 +00:00
Disable filament merge option if not SEMM
This commit is contained in:
@@ -1489,10 +1489,9 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
|
||||
menu, wxID_ANY, _L("Delete"), _L("Delete this filament"), [](wxCommandEvent&) {
|
||||
plater()->sidebar().delete_filament(-2); }, "", nullptr,
|
||||
[]() {
|
||||
auto& sidebar = plater()->sidebar();
|
||||
return sidebar.combos_filament().size() > 1
|
||||
return plater()->sidebar().combos_filament().size() > 1
|
||||
// Orca: only show delete filament option for SEMM machines unless is BBL
|
||||
&& sidebar.should_show_SEMM_buttons();
|
||||
&& Sidebar::should_show_SEMM_buttons();
|
||||
}, m_parent);
|
||||
}
|
||||
|
||||
@@ -1502,7 +1501,7 @@ void MenuFactory::create_filament_action_menu(bool init, int active_filament_men
|
||||
|
||||
wxMenu* sub_menu = new wxMenu();
|
||||
std::vector<wxBitmap*> icons = get_extruder_color_icons(true);
|
||||
int filaments_cnt = icons.size();
|
||||
int filaments_cnt = Sidebar::should_show_SEMM_buttons() ? icons.size() : 0;
|
||||
for (int i = 0; i < filaments_cnt; i++) {
|
||||
if (i == active_filament_menu_id)
|
||||
continue;
|
||||
|
||||
Reference in New Issue
Block a user