FIX: the color of volume is incorrect when merging filament
jira: none Change-Id: I13a9d02b1c8ee57e689ce6477b7aebb86c5f7673
This commit is contained in:
parent
5c56b43166
commit
65267b9866
|
@ -735,13 +735,13 @@ void ObjectList::update_filament_values_for_items_when_delete_filament(const siz
|
||||||
if (object->volumes.size() > 1) {
|
if (object->volumes.size() > 1) {
|
||||||
for (size_t id = 0; id < object->volumes.size(); id++) {
|
for (size_t id = 0; id < object->volumes.size(); id++) {
|
||||||
item = m_objects_model->GetItemByVolumeId(i, id);
|
item = m_objects_model->GetItemByVolumeId(i, id);
|
||||||
if (!item) continue;
|
if (!item)
|
||||||
if (!object->volumes[id]->config.has("extruder") || size_t(object->volumes[id]->config.extruder()) == filament_id + 1) {
|
continue;
|
||||||
int new_extruder = object->config.extruder() > filament_id ? object->config.extruder() - 1 : object->config.extruder();
|
if (!object->volumes[id]->config.has("extruder")) {
|
||||||
if (replace_id >= 0)
|
continue;
|
||||||
new_extruder = replace_filament_id;
|
}
|
||||||
extruder = wxString::Format("%d", new_extruder);
|
else if (size_t(object->volumes[id]->config.extruder()) == filament_id + 1) {
|
||||||
object->volumes[id]->config.set_key_value("extruder", new ConfigOptionInt(new_extruder));
|
object->volumes[id]->config.set_key_value("extruder", new ConfigOptionInt(replace_filament_id));
|
||||||
} else {
|
} else {
|
||||||
int new_extruder = object->volumes[id]->config.extruder() > filament_id ? object->volumes[id]->config.extruder() - 1 : object->volumes[id]->config.extruder();
|
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);
|
extruder = wxString::Format("%d", new_extruder);
|
||||||
|
|
Loading…
Reference in New Issue