diff options
author | YuSanka <yusanka@gmail.com> | 2021-06-02 15:36:49 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2021-06-02 15:36:49 +0300 |
commit | 4b5e568f141e3ff7e4555e33f189938acb43187d (patch) | |
tree | f32638012fbfff8493420bccef82b9c08c03532f /src | |
parent | 7eebd56b5f281a770485eca5f29e51b9e77f3a56 (diff) |
Follow-up 7eebd56b5f281a770485eca5f29e51b9e77f3a56 - fixed a typo
+ added add_negative.svg for dark mode
Diffstat (limited to 'src')
-rw-r--r-- | src/libslic3r/Model.cpp | 4 | ||||
-rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp index e402baac5..e69929150 100644 --- a/src/libslic3r/Model.cpp +++ b/src/libslic3r/Model.cpp @@ -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; }); } diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index cfb85ce31..34804f2a5 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -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); } |