3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Follow-up 7eebd56b5f - fixed a typo

Browse source 
+ added add_negative.svg for dark mode
This commit is contained in:
YuSanka 2021-06-02 14:36:49 +02:00
parent 7eebd56b5f
commit 4b5e568f14
4 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/Model.cpp
View file

@ -725,7 +725,9 @@ void ModelObject::sort_volumes(bool full_sort)
// sort have to controll "place" of the support blockers/enforcers. But one of the model parts have to be on the first place.
else
std::stable_sort(volumes.begin(), volumes.end(), [](ModelVolume* vl, ModelVolume* vr) {
return vl->type() > ModelVolumeType::PARAMETER_MODIFIER && vl->type() < vr->type();
ModelVolumeType vl_type = vl->type() > ModelVolumeType::PARAMETER_MODIFIER ? vl->type() : ModelVolumeType::PARAMETER_MODIFIER;
ModelVolumeType vr_type = vr->type() > ModelVolumeType::PARAMETER_MODIFIER ? vr->type() : ModelVolumeType::PARAMETER_MODIFIER;
return vl_type < vr_type;
});
}

2
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -3913,7 +3913,7 @@ void ObjectList::apply_volumes_order()
if (wxGetApp().app_config->get("order_volumes") != "1" || !m_objects)
return;
for (int obj_idx = 0; m_objects->size(); obj_idx++)
for (int obj_idx = 0; obj_idx < m_objects->size(); obj_idx++)
reorder_volumes_and_get_selection(obj_idx);
}