From ba18b67e12c7586eb8804d005b19ab4b1c3cf796 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Mon, 16 Mar 2026 18:56:17 +0800 Subject: [PATCH] small tweak --- src/libslic3r/GCode/ToolOrdering.cpp | 5 ++--- src/libslic3r/GCode/ToolOrdering.hpp | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index d4784c5278..1dd7cc8da2 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -381,7 +381,6 @@ void ToolOrdering::sort_and_build_data(const PrintObject& object , unsigned int // (print->config().print_sequence == PrintSequence::ByObject is true). ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extruder, bool prime_multi_material) { - m_wipe_tower_type = object.print()->wipe_tower_type(); m_print_full_config = &object.print()->full_print_config(); m_print_object_ptr = &object; m_print = const_cast(object.print()); @@ -427,7 +426,6 @@ ToolOrdering::ToolOrdering(const PrintObject &object, unsigned int first_extrude // (print->config().print_sequence == PrintSequence::ByObject is false). ToolOrdering::ToolOrdering(const Print &print, unsigned int first_extruder, bool prime_multi_material) { - m_wipe_tower_type = print.wipe_tower_type(); m_print_full_config = &print.full_print_config(); m_print = const_cast(&print); // for update the context of print m_print_config_ptr = &print.config(); @@ -1222,12 +1220,13 @@ void ToolOrdering::reorder_extruders_for_minimum_flush_volume(bool reorder_first using FlushMatrix = std::vector>; size_t nozzle_nums = print_config->nozzle_diameter.values.size(); + const auto wipe_tower_type = m_print->wipe_tower_type(); std::vector nozzle_flush_mtx; for (size_t nozzle_id = 0; nozzle_id < nozzle_nums; ++nozzle_id) { std::vector flush_matrix(cast(get_flush_volumes_matrix(print_config->flush_volumes_matrix.values, nozzle_id, nozzle_nums))); std::vector> wipe_volumes; - if ((print_config->purge_in_prime_tower && print_config->single_extruder_multi_material) || m_wipe_tower_type == WipeTowerType::Type1) { + if ((print_config->purge_in_prime_tower && print_config->single_extruder_multi_material) || wipe_tower_type == WipeTowerType::Type1) { for (unsigned int i = 0; i < number_of_extruders; ++i) wipe_volumes.push_back(std::vector(flush_matrix.begin() + i * number_of_extruders, flush_matrix.begin() + (i + 1) * number_of_extruders)); } else { diff --git a/src/libslic3r/GCode/ToolOrdering.hpp b/src/libslic3r/GCode/ToolOrdering.hpp index fdac3be98a..f584b20707 100644 --- a/src/libslic3r/GCode/ToolOrdering.hpp +++ b/src/libslic3r/GCode/ToolOrdering.hpp @@ -279,7 +279,6 @@ private: const PrintObject* m_print_object_ptr = nullptr; Print* m_print; bool m_sorted = false; - WipeTowerType m_wipe_tower_type = WipeTowerType::Type1; FilamentChangeStats m_stats_by_single_extruder; FilamentChangeStats m_stats_by_multi_extruder_curr;