FIX: modify the filament id for painting color

jira: none
Change-Id: I25dcab95f1499783afd892c790f1e18232ea4f72
(cherry picked from commit f7a0e66e0dd16531d2318843ec86630232880867)
This commit is contained in:
zhimin.zeng
2024-10-29 14:05:53 +08:00
committed by Noisyfox
parent e8d77ddb58
commit 1765388326
4 changed files with 11 additions and 7 deletions

View File

@@ -1957,7 +1957,7 @@ void Sidebar::delete_filament(size_t filament_id, int replace_filament_id) {
wxGetApp().preset_bundle->update_num_filaments(filament_id);
wxGetApp().plater()->get_partplate_list().on_filament_deleted(filament_count, filament_id);
wxGetApp().plater()->on_filaments_delete(filament_count, filament_id, replace_filament_id > filament_id ? (replace_filament_id - 1) : replace_filament_id);
wxGetApp().plater()->on_filaments_delete(filament_count, filament_id, replace_filament_id > (int)filament_id ? (replace_filament_id - 1) : replace_filament_id);
wxGetApp().get_tab(Preset::TYPE_PRINT)->update();
wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config);
}
@@ -13545,7 +13545,7 @@ void Plater::on_filaments_delete(size_t num_filaments, size_t filament_id, int r
// update mmu info
for (ModelObject *mo : wxGetApp().model().objects) {
for (ModelVolume *mv : mo->volumes) {
mv->update_extruder_count_when_delete_filament(num_filaments, filament_id, replace_filament_id);
mv->update_extruder_count_when_delete_filament(num_filaments, filament_id + 1, replace_filament_id + 1); // this function is 1 base
}
}