mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2026-01-04 22:07:41 -07:00
FIX: N3S should only show one slot
and fix crash on calipresetpage jira: STUDIO-10669 Change-Id: I93aecdcc360d47baa72ef08af711f3d06206d5e2 (cherry picked from commit 926cfb14d28a196082b2437ace182e960c0c66c2)
This commit is contained in:
parent
0235329bff
commit
929b02dc79
1 changed files with 7 additions and 0 deletions
|
|
@ -1454,6 +1454,9 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::map<int, Preset*
|
|||
|
||||
bool CalibrationPresetPage::is_filament_in_blacklist(int tray_id, Preset* preset, std::string& error_tips)
|
||||
{
|
||||
if (!curr_obj)
|
||||
return true;
|
||||
|
||||
int ams_id;
|
||||
int slot_id;
|
||||
int out_tray_id;
|
||||
|
|
@ -2511,6 +2514,10 @@ void CalibrationPresetPage::update_multi_extruder_filament_combobox(const std::s
|
|||
item_size = 1;
|
||||
}
|
||||
|
||||
if (ams_id_int >= 128 && ams_id_int < 153) { // N3S
|
||||
item_size = 1;
|
||||
}
|
||||
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (i < item_size) {
|
||||
if (nozzle_id == 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue