juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-bbl printer filament grouping by mapping all filaments/tools to group 0 (#12449, #12766)

Browse Source
This commit is contained in:
Noisyfox
2026-03-14 23:30:37 +08:00
parent d28e964e04
commit 478e8bda16
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libslic3r/GCode/ToolOrdering.cpp
View File

@@ -1321,19 +1321,18 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first
return false; return false;
}; };
if (m_print->is_BBL_printer() || number_of_extruders == 1){ auto maps_without_group = filament_maps;
for (auto& item : maps_without_group)
item = 0;
reorder_filaments_for_minimum_flush_volume( reorder_filaments_for_minimum_flush_volume(
filament_lists, filament_lists,
filament_maps, m_print->is_BBL_printer() ? filament_maps : maps_without_group, // non-bbl printers do not support filament group yet
layer_filaments, layer_filaments,
nozzle_flush_mtx, nozzle_flush_mtx,
get_custom_seq, get_custom_seq,
&filament_sequences &filament_sequences
); );
} else {
// For non-bbl multi-extruder printers we don't support filament group yet, so we keep the layer sequence because we don't flush based on order
filament_sequences = layer_filaments;
}
auto curr_flush_info = calc_filament_change_info_by_toolorder(print_config, filament_maps, nozzle_flush_mtx, filament_sequences); auto curr_flush_info = calc_filament_change_info_by_toolorder(print_config, filament_maps, nozzle_flush_mtx, filament_sequences);
if (nozzle_nums <= 1) if (nozzle_nums <= 1)
@@ -1349,9 +1348,6 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first
// always calculate the info by one extruder // always calculate the info by one extruder
{ {
std::vector<std::vector<unsigned int>>filament_sequences_one_extruder; std::vector<std::vector<unsigned int>>filament_sequences_one_extruder;
auto maps_without_group = filament_maps;
for (auto& item : maps_without_group)
item = 0;
reorder_filaments_for_minimum_flush_volume( reorder_filaments_for_minimum_flush_volume(
filament_lists, filament_lists,
maps_without_group, maps_without_group,