juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filament remap should not "paint" unpainted triangles (#12437)

Browse Source 
fix: filament remap should not "paint" unpainted triangles and should update the object extruder UI
This commit is contained in:
Sabriel-Koh
2026-02-23 22:45:26 +08:00
committed by GitHub
parent 3b350a93f0
commit 1f4fce974f
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View File

@@ -1286,9 +1286,6 @@ void GLGizmoMmuSegmentation::remap_filament_assignments()
size_t dst = m_extruder_remap[src]; size_t dst = m_extruder_remap[src];
if (dst != src) { if (dst != src) {
state_map[src+start_extruder] = static_cast<EnforcerBlockerType>(dst+start_extruder); state_map[src+start_extruder] = static_cast<EnforcerBlockerType>(dst+start_extruder);
if (src == 0)
state_map[0] = static_cast<EnforcerBlockerType>(dst + start_extruder);
any_change = true; any_change = true;
} }
} }
@@ -1319,11 +1316,19 @@ void GLGizmoMmuSegmentation::remap_filament_assignments()
// ORCA: Remap base volume extruder as well if selected // ORCA: Remap base volume extruder as well if selected
int current_ext_id = mv->extruder_id(); int current_ext_id = mv->extruder_id();
int current_idx = (current_ext_id > 0) ? current_ext_id - 1 : 0; int current_idx = (current_ext_id > 0) ? current_ext_id - 1 : 0;
if (current_idx >= 0 && current_idx < m_extruder_remap.size()) { if (current_idx >= 0 && current_idx < m_extruder_remap.size()) {
size_t dest_idx = m_extruder_remap[current_idx]; size_t dest_idx = m_extruder_remap[current_idx];
if (dest_idx != current_idx) { if (dest_idx != current_idx) {
mv->config.set("extruder", (int)dest_idx + 1); // Check if volume has its own extruder config or uses object's fallback
const ConfigOption *vol_opt = mv->config.option("extruder");
if (vol_opt != nullptr && vol_opt->getInt() != 0) {
// Volume has its own extruder setting, update it
mv->config.set("extruder", (int)dest_idx + 1);
} else {
// Volume uses object's extruder setting, update the object
mo->config.set("extruder", (int)dest_idx + 1);
}
if (idx < m_volumes_extruder_idxs.size()) if (idx < m_volumes_extruder_idxs.size())
m_volumes_extruder_idxs[idx] = (int)dest_idx + 1; m_volumes_extruder_idxs[idx] = (int)dest_idx + 1;
volume_extruder_changed = true; volume_extruder_changed = true;
@@ -1335,8 +1340,11 @@ void GLGizmoMmuSegmentation::remap_filament_assignments()
if (updated) { if (updated) {
// ORCA: Update renderer colors if base volume extruder changed // ORCA: Update renderer colors if base volume extruder changed
if (volume_extruder_changed) if (volume_extruder_changed) {
this->update_triangle_selectors_colors(); this->update_triangle_selectors_colors();
// ORCA: Update GUI_ObjectList extruder column to reflect the new extruder value
wxGetApp().obj_list()->update_objects_list_filament_column(wxGetApp().filaments_cnt());
}
// ORCA: Removed "Filament remapping finished" notification to reduce UI noise. // ORCA: Removed "Filament remapping finished" notification to reduce UI noise.
update_model_object(); update_model_object();