diff options
| -rw-r--r-- | resources/icons/white/add_negative.svg | 15 | ||||
| -rw-r--r-- | resources/icons/white/add_part.svg | 19 | ||||
| -rw-r--r-- | src/libslic3r/Model.cpp | 4 | ||||
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectList.cpp | 2 |
4 files changed, 28 insertions, 12 deletions
diff --git a/resources/icons/white/add_negative.svg b/resources/icons/white/add_negative.svg new file mode 100644 index 000000000..0173d1f0d --- /dev/null +++ b/resources/icons/white/add_negative.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> +<g id="add_x5F_part"> + <g> + <path fill="#ED6B21" d="M14,5.5H8C7.72,5.5,7.5,5.28,7.5,5S7.72,4.5,8,4.5h6c0.28,0,0.5,0.22,0.5,0.5S14.28,5.5,14,5.5z"/> + </g> + <path fill="#FFFFFF" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62 + c-0.29,0-0.53-0.24-0.53-0.53L2.04,6.12c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15l3.19,0v0 + c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81,0.16-1.11,0.46 + C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3 + C11.5,10.01,11.27,9.78,10.98,9.78z"/> +</g> +</svg> diff --git a/resources/icons/white/add_part.svg b/resources/icons/white/add_part.svg index b7c800bbb..f4ee11432 100644 --- a/resources/icons/white/add_part.svg +++ b/resources/icons/white/add_part.svg @@ -2,19 +2,18 @@ <!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve"> -<g id="add_x5F_part_1_"> +<g id="add_x5F_part"> <g> - <path fill="#ED6B21" d="M11,15c-0.55,0-1-0.45-1-1V8c0-0.55,0.45-1,1-1s1,0.45,1,1v6C12,14.55,11.55,15,11,15z"/> + <path fill="#ED6B21" d="M11,8.5c-0.28,0-0.5-0.22-0.5-0.5V2c0-0.28,0.22-0.5,0.5-0.5s0.5,0.22,0.5,0.5v6 + C11.5,8.28,11.28,8.5,11,8.5z"/> </g> <g> - <path fill="#ED6B21" d="M14,12H8c-0.55,0-1-0.45-1-1s0.45-1,1-1h6c0.55,0,1,0.45,1,1S14.55,12,14,12z"/> - </g> - <g> - <path fill="#FFFFFF" d="M10.98,6.22c-0.29,0-0.52-0.23-0.52-0.52V3.61V2.57c0-0.29-0.23-0.52-0.52-0.52H2.62 - c-0.29,0-0.53,0.24-0.53,0.53l-0.05,7.3c0,0.14,0.05,0.27,0.15,0.37c0.1,0.1,0.23,0.15,0.37,0.15h3.19l0,0 - c0.29,0,0.52,0.23,0.52,0.52s-0.23,0.52-0.52,0.52H3.66c-0.01,0-0.01,0-0.02,0H2.56c-0.42,0-0.81-0.16-1.11-0.46 - C1.16,10.69,1,10.29,1,9.87l0.04-7.31C1.05,1.7,1.75,1,2.62,1h7.31c0.86,0,1.57,0.7,1.57,1.57v1.04V5.7 - C11.5,5.99,11.27,6.22,10.98,6.22z"/> + <path fill="#ED6B21" d="M14,5.5H8C7.72,5.5,7.5,5.28,7.5,5S7.72,4.5,8,4.5h6c0.28,0,0.5,0.22,0.5,0.5S14.28,5.5,14,5.5z"/> </g> + <path fill="#FFFFFF" d="M10.98,9.78c-0.29,0-0.52,0.23-0.52,0.52v2.09v1.04c0,0.29-0.23,0.52-0.52,0.52H2.62 + c-0.29,0-0.53-0.24-0.53-0.53L2.04,6.12c0-0.14,0.05-0.27,0.15-0.37c0.1-0.1,0.23-0.15,0.37-0.15l3.19,0v0 + c0.29,0,0.52-0.23,0.52-0.52S6.04,4.55,5.75,4.55H3.66c-0.01,0-0.01,0-0.02,0l-1.08,0c-0.42,0-0.81,0.16-1.11,0.46 + C1.16,5.31,1,5.71,1,6.13l0.04,7.31C1.05,14.3,1.75,15,2.62,15h7.31c0.86,0,1.57-0.7,1.57-1.57v-1.04V10.3 + C11.5,10.01,11.27,9.78,10.98,9.78z"/> </g> </svg> 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); } |
