From 7f46a1c04ca04380f9e346cede1fd6e28030e934 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Thu, 30 Nov 2023 12:11:37 +0800 Subject: [PATCH] FIX: the initial_non_support_extruder_id is not correct Jira: 5270 Change-Id: Id39074b1834cfad871c5afe03e7d00c8114838b9 --- src/libslic3r/GCode.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 7a0f30c7d..ce9d4e05f 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1801,7 +1801,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato } } //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()) { if (!layer_tools.has_object) continue; @@ -1809,9 +1810,14 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato if (print.config().filament_is_support.get_at(extruder)) continue; initial_non_support_extruder_id = extruder; + find_initial_non_support_filament = true; break; } + + if (find_initial_non_support_filament) + break; } + } } break; @@ -1856,7 +1862,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato } } //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()) { if (!layer_tools.has_object) continue; @@ -1864,9 +1871,14 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato if (print.config().filament_is_support.get_at(extruder)) continue; initial_non_support_extruder_id = extruder; + find_initial_non_support_filament = true; break; } + + if (find_initial_non_support_filament) + break; } + } } }