FIX: the initial_non_support_extruder_id is not correct

Jira: 5270
Change-Id: Id39074b1834cfad871c5afe03e7d00c8114838b9
This commit is contained in:
zhimin.zeng 2023-11-30 12:11:37 +08:00 committed by Lane.Wei
parent cbdc59e19f
commit 7f46a1c04c
1 changed files with 14 additions and 2 deletions

View File

@ -1801,7 +1801,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
} }
} }
//BBS: find the non-support filament extruder of object //BBS: find the non-support filament extruder of object
if (has_non_support_filament) if (has_non_support_filament) {
bool find_initial_non_support_filament = false;
for (LayerTools layer_tools : tool_ordering.layer_tools()) { for (LayerTools layer_tools : tool_ordering.layer_tools()) {
if (!layer_tools.has_object) if (!layer_tools.has_object)
continue; continue;
@ -1809,9 +1810,14 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
if (print.config().filament_is_support.get_at(extruder)) if (print.config().filament_is_support.get_at(extruder))
continue; continue;
initial_non_support_extruder_id = extruder; initial_non_support_extruder_id = extruder;
find_initial_non_support_filament = true;
break; break;
} }
if (find_initial_non_support_filament)
break;
} }
}
} }
break; break;
@ -1856,7 +1862,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
} }
} }
//BBS: find the non-support filament extruder of object //BBS: find the non-support filament extruder of object
if (has_non_support_filament) if (has_non_support_filament){
bool find_initial_non_support_filament = false;
for (LayerTools layer_tools : tool_ordering.layer_tools()) { for (LayerTools layer_tools : tool_ordering.layer_tools()) {
if (!layer_tools.has_object) if (!layer_tools.has_object)
continue; continue;
@ -1864,9 +1871,14 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
if (print.config().filament_is_support.get_at(extruder)) if (print.config().filament_is_support.get_at(extruder))
continue; continue;
initial_non_support_extruder_id = extruder; initial_non_support_extruder_id = extruder;
find_initial_non_support_filament = true;
break; break;
} }
if (find_initial_non_support_filament)
break;
} }
}
} }
} }