GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-14 19:01:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg

Browse Source 
# Conflicts:
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
This commit is contained in:
Filip Sykala - NTB T15p 2023-07-12 14:12:57 +02:00
commit ed10fefba8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,11 @@ ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool
this->fill_wipe_tower_partitions(print.config(), object_bottom_z, max_layer_height); this->fill_wipe_tower_partitions(print.config(), object_bottom_z, max_layer_height);
if (this->insert_wipe_tower_extruder()) { if (this->insert_wipe_tower_extruder()) {
// Now convert the 0-based list to 1-based again, because that is what reorder_extruder expects.
for (LayerTools& lt : m_layer_tools) {
for (auto& extruder : lt.extruders)
++extruder;
}
this->reorder_extruders(first_extruder); this->reorder_extruders(first_extruder);
this->fill_wipe_tower_partitions(print.config(), object_bottom_z, max_layer_height); this->fill_wipe_tower_partitions(print.config(), object_bottom_z, max_layer_height);
} }
@ -470,12 +475,11 @@ void ToolOrdering::fill_wipe_tower_partitions(const PrintConfig &config, coordf_
bool ToolOrdering::insert_wipe_tower_extruder() bool ToolOrdering::insert_wipe_tower_extruder()
{ {
// In case that wipe_tower_extruder is set to non-zero, we must make sure that the extruder will be in the list. // In case that wipe_tower_extruder is set to non-zero, we must make sure that the extruder will be in the list.
// The list is 1-based, as is the config value !
bool changed = false; bool changed = false;
if (m_print_config_ptr->wipe_tower_extruder != 0) { if (m_print_config_ptr->wipe_tower_extruder != 0) {
for (LayerTools& lt : m_layer_tools) { for (LayerTools& lt : m_layer_tools) {
if (lt.wipe_tower_partitions > 0) { if (lt.wipe_tower_partitions > 0) {
lt.extruders.emplace_back(m_print_config_ptr->wipe_tower_extruder); lt.extruders.emplace_back(m_print_config_ptr->wipe_tower_extruder - 1);
sort_remove_duplicates(lt.extruders); sort_remove_duplicates(lt.extruders);
changed = true; changed = true;
} }