From 65267b98666567e8ca6d9a76e73500083b7cb6a0 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Thu, 13 Feb 2025 11:42:53 +0800 Subject: [PATCH] FIX: the color of volume is incorrect when merging filament jira: none Change-Id: I13a9d02b1c8ee57e689ce6477b7aebb86c5f7673 --- src/slic3r/GUI/GUI_ObjectList.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 00dac4964..8904f6527 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -735,13 +735,13 @@ void ObjectList::update_filament_values_for_items_when_delete_filament(const siz if (object->volumes.size() > 1) { for (size_t id = 0; id < object->volumes.size(); id++) { item = m_objects_model->GetItemByVolumeId(i, id); - if (!item) continue; - if (!object->volumes[id]->config.has("extruder") || size_t(object->volumes[id]->config.extruder()) == filament_id + 1) { - int new_extruder = object->config.extruder() > filament_id ? object->config.extruder() - 1 : object->config.extruder(); - if (replace_id >= 0) - new_extruder = replace_filament_id; - extruder = wxString::Format("%d", new_extruder); - object->volumes[id]->config.set_key_value("extruder", new ConfigOptionInt(new_extruder)); + if (!item) + continue; + if (!object->volumes[id]->config.has("extruder")) { + continue; + } + else if (size_t(object->volumes[id]->config.extruder()) == filament_id + 1) { + object->volumes[id]->config.set_key_value("extruder", new ConfigOptionInt(replace_filament_id)); } else { int new_extruder = object->volumes[id]->config.extruder() > filament_id ? object->volumes[id]->config.extruder() - 1 : object->volumes[id]->config.extruder(); extruder = wxString::Format("%d", new_extruder);