From 7340488aaf075a9abde9a1c2ae877a02e0b12533 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Wed, 6 Oct 2021 17:24:22 +0200
Subject: [PATCH 1/4] ObjectList: Fixes  * Fixed update of a warning icon for
 multi-part object, when some part with errors was deleted  * Fixed a crash
 when selecting non-Object and non-Volume item (in get_mesh_errors_info() was
 missed check of the obj_idx)

+ Follow-up https://github.com/prusa3d/PrusaSlicer/commit/1cc7b4ba971e8d04558b8a49869d9ce1647b8f77 - some code refactoring:
  * fixed RepairedMeshErrors.merge()
  * get_mesh_errors_count() renamed to get_repaired_errors_count()
---
 src/libslic3r/Model.cpp                   |  6 +-
 src/libslic3r/Model.hpp                   |  4 +-
 src/libslic3r/TriangleMesh.cpp            |  3 +-
 src/libslic3r/TriangleMesh.hpp            | 14 ++--
 src/slic3r/GUI/GUI_ObjectList.cpp         | 80 ++++++++++++-----------
 src/slic3r/GUI/GUI_ObjectList.hpp         | 12 +++-
 src/slic3r/GUI/GUI_ObjectManipulation.cpp |  9 ++-
 src/slic3r/GUI/GUI_ObjectManipulation.hpp |  3 +-
 src/slic3r/GUI/ObjectDataViewModel.cpp    |  8 +++
 src/slic3r/GUI/ObjectDataViewModel.hpp    |  1 +
 src/slic3r/GUI/Plater.cpp                 | 10 +--
 11 files changed, 83 insertions(+), 67 deletions(-)

diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index b681cbdf4..8659e6961 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -1629,10 +1629,10 @@ TriangleMeshStats ModelObject::get_object_stl_stats() const
     return full_stats;
 }
 
-int ModelObject::get_mesh_errors_count(const int vol_idx /*= -1*/) const
+int ModelObject::get_repaired_errors_count(const int vol_idx /*= -1*/) const
 {
     if (vol_idx >= 0)
-        return this->volumes[vol_idx]->get_mesh_errors_count();
+        return this->volumes[vol_idx]->get_repaired_errors_count();
 
     const RepairedMeshErrors& stats = get_object_stl_stats().repaired_errors;
 
@@ -1704,7 +1704,7 @@ void ModelVolume::calculate_convex_hull()
     assert(m_convex_hull.get());
 }
 
-int ModelVolume::get_mesh_errors_count() const
+int ModelVolume::get_repaired_errors_count() const
 {
     const RepairedMeshErrors &stats = this->mesh().stats().repaired_errors;
 
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index ea1d0ed17..6e0063f1b 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -377,7 +377,7 @@ public:
     // Get full stl statistics for all object's meshes
     TriangleMeshStats get_object_stl_stats() const;
     // Get count of errors in the mesh( or all object's meshes, if volume index isn't defined)
-    int         get_mesh_errors_count(const int vol_idx = -1) const;
+    int         get_repaired_errors_count(const int vol_idx = -1) const;
 
 private:
     friend class Model;
@@ -682,7 +682,7 @@ public:
     const TriangleMesh& get_convex_hull() const;
     std::shared_ptr<const TriangleMesh> get_convex_hull_shared_ptr() const { return m_convex_hull; }
     // Get count of errors in the mesh
-    int                 get_mesh_errors_count() const;
+    int                 get_repaired_errors_count() const;
 
     // Helpers for loading / storing into AMF / 3MF files.
     static ModelVolumeType type_from_string(const std::string &s);
diff --git a/src/libslic3r/TriangleMesh.cpp b/src/libslic3r/TriangleMesh.cpp
index e98dcf554..bb3c9fc5c 100644
--- a/src/libslic3r/TriangleMesh.cpp
+++ b/src/libslic3r/TriangleMesh.cpp
@@ -68,8 +68,7 @@ TriangleMesh::TriangleMesh(const indexed_triangle_set &its) : its(its)
 
 TriangleMesh::TriangleMesh(indexed_triangle_set &&its, const RepairedMeshErrors& errors/* = RepairedMeshErrors()*/) : its(std::move(its))
 {
-    if (errors.repaired())
-        m_stats.repaired_errors = errors;
+    m_stats.repaired_errors = errors;
     fill_initial_stats(this->its, m_stats);
 }
 
diff --git a/src/libslic3r/TriangleMesh.hpp b/src/libslic3r/TriangleMesh.hpp
index b223b4346..5223631c0 100644
--- a/src/libslic3r/TriangleMesh.hpp
+++ b/src/libslic3r/TriangleMesh.hpp
@@ -33,14 +33,12 @@ struct RepairedMeshErrors {
 
     void clear() { *this = RepairedMeshErrors(); }
 
-    RepairedMeshErrors merge(const RepairedMeshErrors& rhs) const {
-        RepairedMeshErrors out;
-        out.edges_fixed         = this->edges_fixed         + rhs.edges_fixed;
-        out.degenerate_facets   = this->degenerate_facets   + rhs.degenerate_facets;
-        out.facets_removed      = this->facets_removed      + rhs.facets_removed;
-        out.facets_reversed     = this->facets_reversed     + rhs.facets_reversed;
-        out.backwards_edges     = this->backwards_edges     + rhs.backwards_edges;
-        return out;
+    void merge(const RepairedMeshErrors& rhs) {
+        this->edges_fixed         += rhs.edges_fixed;
+        this->degenerate_facets   += rhs.degenerate_facets;
+        this->facets_removed      += rhs.facets_removed;
+        this->facets_reversed     += rhs.facets_reversed;
+        this->backwards_edges     += rhs.backwards_edges;
     }
 
     bool repaired() const { return degenerate_facets > 0 || edges_fixed > 0 || facets_removed > 0 || facets_reversed > 0 || backwards_edges > 0; }
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 6c416c475..d2a6b6e9a 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -375,9 +375,9 @@ void ObjectList::get_selection_indexes(std::vector<int>& obj_idxs, std::vector<i
     obj_idxs.erase(std::unique(obj_idxs.begin(), obj_idxs.end()), obj_idxs.end());
 }
 
-int ObjectList::get_mesh_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
+int ObjectList::get_repaired_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
 {
-    return obj_idx >= 0 ? (*m_objects)[obj_idx]->get_mesh_errors_count(vol_idx) : 0;
+    return obj_idx >= 0 ? (*m_objects)[obj_idx]->get_repaired_errors_count(vol_idx) : 0;
 }
 
 static std::string get_warning_icon_name(const TriangleMeshStats& stats)
@@ -385,8 +385,11 @@ static std::string get_warning_icon_name(const TriangleMeshStats& stats)
     return stats.manifold() ? (stats.repaired() ? "exclamation_manifold" : "") : "exclamation";
 }
 
-std::pair<wxString, std::string> ObjectList::get_mesh_errors(const int obj_idx, const int vol_idx /*= -1*/, wxString* sidebar_info /*= nullptr*/) const
+MeshErrorsInfo ObjectList::get_mesh_errors_info(const int obj_idx, const int vol_idx /*= -1*/, wxString* sidebar_info /*= nullptr*/) const
 {    
+    if (obj_idx < 0)
+        return { {}, {} }; // hide tooltip
+
     const TriangleMeshStats& stats = vol_idx == -1 ?
         (*m_objects)[obj_idx]->get_object_stl_stats() :
         (*m_objects)[obj_idx]->volumes[vol_idx]->mesh().stats();
@@ -401,7 +404,7 @@ std::pair<wxString, std::string> ObjectList::get_mesh_errors(const int obj_idx,
 
     // Create tooltip string, if there are errors 
     if (stats.repaired()) {
-        const int errors = get_mesh_errors_count(obj_idx, vol_idx);
+        const int errors = get_repaired_errors_count(obj_idx, vol_idx);
         auto_repaired_info = format_wxstr(_L_PLURAL("Auto-repaired %1$d error", "Auto-repaired %1$d errors", errors), errors);
         tooltip += auto_repaired_info +":\n";
 
@@ -434,15 +437,24 @@ std::pair<wxString, std::string> ObjectList::get_mesh_errors(const int obj_idx,
     return { tooltip, get_warning_icon_name(stats) };
 }
 
-std::pair<wxString, std::string> ObjectList::get_mesh_errors(wxString* sidebar_info /*= nullptr*/)
+MeshErrorsInfo ObjectList::get_mesh_errors_info(wxString* sidebar_info /*= nullptr*/)
 {
-    if (!GetSelection())
+    wxDataViewItem item = GetSelection();
+    if (!item)
         return { "", "" };
 
     int obj_idx, vol_idx;
     get_selected_item_indexes(obj_idx, vol_idx);
 
-    return get_mesh_errors(obj_idx, vol_idx, sidebar_info);
+    if (obj_idx < 0) { // child of ObjectItem is selected
+        if (sidebar_info)
+            obj_idx = m_objects_model->GetObjectIdByItem(item);
+        else
+            return { "", "" };
+    }
+    assert(obj_idx >= 0);
+
+    return get_mesh_errors_info(obj_idx, vol_idx, sidebar_info);
 }
 
 void ObjectList::set_tooltip_for_item(const wxPoint& pt)
@@ -478,9 +490,12 @@ void ObjectList::set_tooltip_for_item(const wxPoint& pt)
 #endif //__WXMSW__
     else if (col->GetTitle() == _("Name") && (pt.x >= 2 * wxGetApp().em_unit() && pt.x <= 4 * wxGetApp().em_unit()))
     {
-        int obj_idx, vol_idx;
-        get_selected_item_indexes(obj_idx, vol_idx, item);
-        tooltip = get_mesh_errors(obj_idx, vol_idx).first;
+        if (const ItemType type = m_objects_model->GetItemType(item); 
+            type & (itObject | itVolume)) {
+            int obj_idx = m_objects_model->GetObjectIdByItem(item);
+            int vol_idx = type & itVolume ? m_objects_model->GetVolumeIdByItem(item) : -1;
+            tooltip = get_mesh_errors_info(obj_idx, vol_idx).tooltip;
+        }
     }
     
     GetMainWindow()->SetToolTip(tooltip);
@@ -1797,10 +1812,8 @@ void ObjectList::del_subobject_item(wxDataViewItem& item)
 
     // If last volume item with warning was deleted, unmark object item
     if (type & itVolume) {
-        if (auto obj = object(obj_idx); obj->get_mesh_errors_count() == 0)
-            m_objects_model->DeleteWarningIcon(parent);
-        else
-            m_objects_model->AddWarningIcon(parent, get_warning_icon_name(obj->mesh().stats()));
+        const std::string& icon_name = get_warning_icon_name(object(obj_idx)->get_object_stl_stats());
+        m_objects_model->UpdateWarningIcon(parent, icon_name);
     }
 
     m_objects_model->Delete(item);
@@ -2509,7 +2522,7 @@ void ObjectList::part_selection_changed()
         if (item) {
             // wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item));
             wxGetApp().obj_manipul()->update_item_name(m_objects_model->GetName(item));
-            wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors(obj_idx, volume_id));
+            wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_info(obj_idx, volume_id));
         }
     }
 
@@ -2769,10 +2782,7 @@ void ObjectList::delete_from_model_and_list(const std::vector<ItemForDelete>& it
                         m_objects_model->SetExtruder(extruder, parent);
                     }
                     // If last volume item with warning was deleted, unmark object item
-                    if (obj->get_mesh_errors_count() == 0)
-                        m_objects_model->DeleteWarningIcon(parent);
-                    else
-                        m_objects_model->AddWarningIcon(parent, get_warning_icon_name(obj->mesh().stats()));
+                    m_objects_model->UpdateWarningIcon(parent, get_warning_icon_name(obj->get_object_stl_stats()));
                 }
                 wxGetApp().plater()->canvas3D()->ensure_on_bed(item->obj_idx, printer_technology() != ptSLA);
             }
@@ -4055,7 +4065,7 @@ void ObjectList::fix_through_netfabb()
     if (vol_idxs.empty()) {
 #if !FIX_THROUGH_NETFABB_ALWAYS
         for (int i = int(obj_idxs.size())-1; i >= 0; --i)
-                if (object(obj_idxs[i])->get_mesh_errors_count() == 0)
+                if (object(obj_idxs[i])->get_repaired_errors_count() == 0)
                     obj_idxs.erase(obj_idxs.begin()+i);
 #endif // FIX_THROUGH_NETFABB_ALWAYS
         for (int obj_idx : obj_idxs)
@@ -4065,7 +4075,7 @@ void ObjectList::fix_through_netfabb()
         ModelObject* obj = object(obj_idxs.front());
 #if !FIX_THROUGH_NETFABB_ALWAYS
         for (int i = int(vol_idxs.size()) - 1; i >= 0; --i)
-            if (obj->get_mesh_errors_count(vol_idxs[i]) == 0)
+            if (obj->get_repaired_errors_count(vol_idxs[i]) == 0)
                 vol_idxs.erase(vol_idxs.begin() + i);
 #endif // FIX_THROUGH_NETFABB_ALWAYS
         for (int vol_idx : vol_idxs)
@@ -4121,7 +4131,7 @@ void ObjectList::fix_through_netfabb()
         int vol_idx{ -1 };
         for (int obj_idx : obj_idxs) {
 #if !FIX_THROUGH_NETFABB_ALWAYS
-            if (object(obj_idx)->get_mesh_errors_count(vol_idx) == 0)
+            if (object(obj_idx)->get_repaired_errors_count(vol_idx) == 0)
                 continue;
 #endif // FIX_THROUGH_NETFABB_ALWAYS
             if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
@@ -4178,24 +4188,18 @@ void ObjectList::simplify()
 
 void ObjectList::update_item_error_icon(const int obj_idx, const int vol_idx) const 
 {
-    const wxDataViewItem item = vol_idx <0 ? m_objects_model->GetItemById(obj_idx) :
-                                m_objects_model->GetItemByVolumeId(obj_idx, vol_idx);
-    if (!item)
+    auto obj = object(obj_idx);
+    if (wxDataViewItem obj_item = m_objects_model->GetItemById(obj_idx)) {
+        const std::string& icon_name = get_warning_icon_name(obj->get_object_stl_stats());
+        m_objects_model->UpdateWarningIcon(obj_item, icon_name);
+    }
+
+    if (vol_idx < 0)
         return;
 
-    if (get_mesh_errors_count(obj_idx, vol_idx) == 0)
-    {
-        // if whole object has no errors more,
-        if (get_mesh_errors_count(obj_idx) == 0)
-            // unmark all items in the object
-            m_objects_model->DeleteWarningIcon(vol_idx >= 0 ? m_objects_model->GetParent(item) : item, true);
-        else
-            // unmark fixed item only
-            m_objects_model->DeleteWarningIcon(item);
-    }
-    else {
-        auto obj = object(obj_idx);
-        m_objects_model->AddWarningIcon(item, get_warning_icon_name(vol_idx < 0 ? obj->mesh().stats() : obj->volumes[vol_idx]->mesh().stats()));
+    if (wxDataViewItem vol_item = m_objects_model->GetItemByVolumeId(obj_idx, vol_idx)) {
+        const std::string& icon_name = get_warning_icon_name(obj->volumes[vol_idx]->mesh().stats());
+        m_objects_model->UpdateWarningIcon(vol_item, icon_name);
     }
 }
 
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 54e3f5d45..cc619fc45 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -67,6 +67,12 @@ struct ItemForDelete
     }
 };
 
+struct MeshErrorsInfo 
+{
+    wxString    tooltip;
+    std::string warning_icon_name;
+};
+
 class ObjectList : public wxDataViewCtrl
 {
 public:
@@ -212,13 +218,13 @@ public:
     void                get_selected_item_indexes(int& obj_idx, int& vol_idx, const wxDataViewItem& item = wxDataViewItem(0));
     void                get_selection_indexes(std::vector<int>& obj_idxs, std::vector<int>& vol_idxs);
     // Get count of errors in the mesh
-    int                 get_mesh_errors_count(const int obj_idx, const int vol_idx = -1) const;
+    int                 get_repaired_errors_count(const int obj_idx, const int vol_idx = -1) const;
     // Get list of errors in the mesh and name of the warning icon 
     // Return value is a pair <Tooltip, warning_icon_name>, used for the tooltip and related warning icon
     // Function without parameters is for a call from Manipulation panel, 
     // when we don't know parameters of selected item 
-    std::pair<wxString, std::string> get_mesh_errors(const int obj_idx, const int vol_idx = -1, wxString* sidebar_info = nullptr) const;
-    std::pair<wxString, std::string> get_mesh_errors(wxString* sidebar_info = nullptr);
+    MeshErrorsInfo      get_mesh_errors_info(const int obj_idx, const int vol_idx = -1, wxString* sidebar_info = nullptr) const;
+    MeshErrorsInfo      get_mesh_errors_info(wxString* sidebar_info = nullptr);
     void                set_tooltip_for_item(const wxPoint& pt);
 
     void                selection_changed();
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 7d5f80a30..b8c053f88 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1,5 +1,4 @@
 #include "GUI_ObjectManipulation.hpp"
-#include "GUI_ObjectList.hpp"
 #include "I18N.hpp"
 #include "BitmapComboBox.hpp"
 
@@ -132,7 +131,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) :
                     return;
 
                 wxGetApp().obj_list()->fix_through_netfabb();
-                update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors());
+                update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_info());
             });
 
     sizer->Add(m_fix_throught_netfab_bitmap);
@@ -781,12 +780,12 @@ void ObjectManipulation::update_item_name(const wxString& item_name)
     m_item_name->SetLabel(item_name);
 }
 
-void ObjectManipulation::update_warning_icon_state(const std::pair<wxString, std::string>& warning)
+void ObjectManipulation::update_warning_icon_state(const MeshErrorsInfo& warning)
 {   
-    if (const std::string& warning_icon_name = warning.second;
+    if (const std::string& warning_icon_name = warning.warning_icon_name;
         !warning_icon_name.empty())
         m_manifold_warning_bmp = ScalableBitmap(m_parent, warning_icon_name);
-    const wxString& tooltip = warning.first;
+    const wxString& tooltip = warning.tooltip;
     m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp());
     m_fix_throught_netfab_bitmap->SetMinSize(tooltip.IsEmpty() ? wxSize(0,0) : m_manifold_warning_bmp.bmp().GetSize());
     m_fix_throught_netfab_bitmap->SetToolTip(tooltip);
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
index 9b77591be..a15c72fb8 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp
@@ -4,6 +4,7 @@
 #include <memory>
 
 #include "GUI_ObjectSettings.hpp"
+#include "GUI_ObjectList.hpp"
 #include "libslic3r/Point.hpp"
 #include <float.h>
 
@@ -194,7 +195,7 @@ public:
 #endif // __APPLE__
 
     void update_item_name(const wxString &item_name);
-    void update_warning_icon_state(const std::pair<wxString, std::string>& warning);
+    void update_warning_icon_state(const MeshErrorsInfo& warning);
     void msw_rescale();
     void sys_color_changed();
     void on_change(const std::string& opt_key, int axis, double new_value);
diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
index 78735b925..ed4b477b8 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.cpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -1786,6 +1786,14 @@ bool ObjectDataViewModel::HasWarningIcon(const wxDataViewItem& item) const
     return node->has_warning_icon();
 }
 
+void ObjectDataViewModel::UpdateWarningIcon(const wxDataViewItem& item, const std::string& warning_icon_name)
+{
+    if (warning_icon_name.empty())
+        DeleteWarningIcon(item, true);
+    else
+        AddWarningIcon(item, warning_icon_name);
+}
+
 } // namespace GUI
 } // namespace Slic3r
 
diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp
index ca7a0cde0..f8885b206 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.hpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.hpp
@@ -389,6 +389,7 @@ public:
                               const std::string& warning_icon_name = std::string());
     void        AddWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
     void        DeleteWarningIcon(const wxDataViewItem& item, const bool unmark_object = false);
+    void        UpdateWarningIcon(const wxDataViewItem& item, const std::string& warning_name);
     bool        HasWarningIcon(const wxDataViewItem& item) const;
     t_layer_height_range    GetLayerRangeByItem(const wxDataViewItem& item) const;
 
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index f00c6df3e..68c20d497 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1204,9 +1204,9 @@ void Sidebar::show_info_sizer()
                                                        static_cast<int>(model_object->facets_count()), stats.number_of_parts));
 
     wxString info_manifold_label;
-    auto mesh_errors = obj_list()->get_mesh_errors(&info_manifold_label);
-    wxString tooltip = mesh_errors.first;
-    p->object_info->update_warning_icon(mesh_errors.second);
+    auto mesh_errors = obj_list()->get_mesh_errors_info(&info_manifold_label);
+    wxString tooltip = mesh_errors.tooltip;
+    p->object_info->update_warning_icon(mesh_errors.warning_icon_name);
     p->object_info->info_manifold->SetLabel(info_manifold_label);
     p->object_info->info_manifold->SetToolTip(tooltip);
     p->object_info->manifold_warning_icon->SetToolTip(tooltip);
@@ -4593,14 +4593,14 @@ bool Plater::priv::can_fix_through_netfabb() const
     // Fixing only if the model is not manifold.
     if (vol_idxs.empty()) {
         for (auto obj_idx : obj_idxs)
-            if (model.objects[obj_idx]->get_mesh_errors_count() > 0)
+            if (model.objects[obj_idx]->get_repaired_errors_count() > 0)
                 return true;
         return false;
     }
 
     int obj_idx = obj_idxs.front();
     for (auto vol_idx : vol_idxs)
-        if (model.objects[obj_idx]->get_mesh_errors_count(vol_idx) > 0)
+        if (model.objects[obj_idx]->get_repaired_errors_count(vol_idx) > 0)
             return true;
     return false;
 #endif // FIX_THROUGH_NETFABB_ALWAYS

From c15be26bff17ed0354323f047ba56cb317d6c63b Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Thu, 7 Oct 2021 09:12:31 +0200
Subject: [PATCH 2/4] Check if object's size appears to be zero, when loading
 the model file.

---
 src/libslic3r/Model.cpp   | 16 ++++++++++++++++
 src/libslic3r/Model.hpp   |  1 +
 src/slic3r/GUI/Plater.cpp |  8 ++++++++
 3 files changed, 25 insertions(+)

diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index 8659e6961..1ade36e36 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -513,6 +513,22 @@ void Model::convert_from_meters(bool only_small_volumes)
         }
 }
 
+static constexpr const double zero_volume = 0.0000000001;
+
+int Model::removed_objects_with_zero_volume()
+{
+    if (objects.size() == 0)
+        return 0;
+
+    int removed = 0;
+    for (int i = int(objects.size()) - 1; i >= 0; i--)
+        if (objects[i]->get_object_stl_stats().volume < zero_volume) {
+            delete_object(size_t(i));
+            removed++;
+        }
+    return removed;
+}
+
 void Model::adjust_min_z()
 {
     if (objects.empty())
diff --git a/src/libslic3r/Model.hpp b/src/libslic3r/Model.hpp
index 6e0063f1b..11cbdc0cf 100644
--- a/src/libslic3r/Model.hpp
+++ b/src/libslic3r/Model.hpp
@@ -1124,6 +1124,7 @@ public:
     void          convert_from_imperial_units(bool only_small_volumes);
     bool          looks_like_saved_in_meters() const;
     void          convert_from_meters(bool only_small_volumes);
+    int           removed_objects_with_zero_volume();
 
     // Ensures that the min z of the model is not negative
     void 		  adjust_min_z();
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 68c20d497..0710c0916 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -2438,6 +2438,14 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
             };
 
             if (!is_project_file) {
+                if (int deleted_objects = model.removed_objects_with_zero_volume(); deleted_objects > 0) {
+                    MessageDialog(q, format_wxstr(_L_PLURAL(
+                        "Object size from file %s appears to be zero.\n"
+                        "This object has been removed from the model",
+                        "Objects size from file %s appear to be zero.\n"
+                        "These objects have been removed from the model", deleted_objects), from_path(filename)) + "\n",
+                        _L("Object size is zero"), wxICON_INFORMATION | wxOK).ShowModal();
+                }
                 if (imperial_units)
                     // Convert even if the object is big.
                     convert_from_imperial_units(model, false);

From 1b828ca7f5a70b81a6c35c6d5755879a01f09128 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Thu, 7 Oct 2021 10:14:55 +0200
Subject: [PATCH 3/4] Deleted unused PNG-files. Added mirroring_transparent.svg
 (thanks for @AkiraNorthstar)

---
 resources/icons/colorchange_add_off.png         | Bin 600 -> 0 bytes
 resources/icons/colorchange_add_on.png          | Bin 695 -> 0 bytes
 resources/icons/colorchange_delete_off.png      | Bin 589 -> 0 bytes
 resources/icons/colorchange_delete_on.png       | Bin 628 -> 0 bytes
 resources/icons/down_half_circle.png            | Bin 631 -> 0 bytes
 resources/icons/left_half_circle.png            | Bin 651 -> 0 bytes
 resources/icons/mirroring_transparent.png       | Bin 93 -> 0 bytes
 resources/icons/mirroring_transparent.svg       |   4 ++++
 resources/icons/mode_advanced_.png              | Bin 1466 -> 0 bytes
 resources/icons/mode_advanced_sq.png            | Bin 158 -> 0 bytes
 resources/icons/mode_expert_.png                | Bin 1379 -> 0 bytes
 resources/icons/mode_expert_sq.png              | Bin 164 -> 0 bytes
 resources/icons/mode_simple_.png                | Bin 1164 -> 0 bytes
 resources/icons/mode_simple_sq.png              | Bin 158 -> 0 bytes
 resources/icons/one_layer_lock_off.png          | Bin 1001 -> 0 bytes
 resources/icons/one_layer_lock_on.png           | Bin 1106 -> 0 bytes
 resources/icons/one_layer_unlock_off.png        | Bin 997 -> 0 bytes
 resources/icons/one_layer_unlock_on.png         | Bin 1129 -> 0 bytes
 resources/icons/pause_add.png                   | Bin 5883 -> 0 bytes
 resources/icons/right_half_circle.png           | Bin 654 -> 0 bytes
 resources/icons/row.png                         | Bin 1923 -> 0 bytes
 resources/icons/shape_ungroup.png               | Bin 803 -> 0 bytes
 resources/icons/table.png                       | Bin 465 -> 0 bytes
 resources/icons/up_half_circle.png              | Bin 650 -> 0 bytes
 resources/icons/variable_layer_height_reset.png | Bin 1050 -> 0 bytes
 .../icons/variable_layer_height_tooltip.png     | Bin 10017 -> 0 bytes
 26 files changed, 4 insertions(+)
 delete mode 100644 resources/icons/colorchange_add_off.png
 delete mode 100644 resources/icons/colorchange_add_on.png
 delete mode 100644 resources/icons/colorchange_delete_off.png
 delete mode 100644 resources/icons/colorchange_delete_on.png
 delete mode 100644 resources/icons/down_half_circle.png
 delete mode 100644 resources/icons/left_half_circle.png
 delete mode 100644 resources/icons/mirroring_transparent.png
 create mode 100644 resources/icons/mirroring_transparent.svg
 delete mode 100644 resources/icons/mode_advanced_.png
 delete mode 100644 resources/icons/mode_advanced_sq.png
 delete mode 100644 resources/icons/mode_expert_.png
 delete mode 100644 resources/icons/mode_expert_sq.png
 delete mode 100644 resources/icons/mode_simple_.png
 delete mode 100644 resources/icons/mode_simple_sq.png
 delete mode 100644 resources/icons/one_layer_lock_off.png
 delete mode 100644 resources/icons/one_layer_lock_on.png
 delete mode 100644 resources/icons/one_layer_unlock_off.png
 delete mode 100644 resources/icons/one_layer_unlock_on.png
 delete mode 100644 resources/icons/pause_add.png
 delete mode 100644 resources/icons/right_half_circle.png
 delete mode 100644 resources/icons/row.png
 delete mode 100644 resources/icons/shape_ungroup.png
 delete mode 100644 resources/icons/table.png
 delete mode 100644 resources/icons/up_half_circle.png
 delete mode 100644 resources/icons/variable_layer_height_reset.png
 delete mode 100644 resources/icons/variable_layer_height_tooltip.png

diff --git a/resources/icons/colorchange_add_off.png b/resources/icons/colorchange_add_off.png
deleted file mode 100644
index 6ddeccbe0a2a82019c5c2efd1773c20c0833c4d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 600
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBC{YpM6XN<mf#E+807)95
z)xG~~oIqA|MEu`6=YO8s|C2lZ?_YJbC^Q1-2Kka8zhEF$e(>qfL!5oT`ng2Uv7KO-
z`>oK>c;wi#w-Y8-9OfwbtPfPmnB?v5!uX#__a2bLS>O>_%)p?h48n{ROYO^mg6t)p
zzOL*KxFrR+#s37PM*)TAdb&7<NL((RkS*S%z|+>gOf=4WlTK;F^nd^Dc_ijpxxR1T
zX#3n&TDl=r<ozU*o5uwilFv*!JW;tb-E!liBim0M+O+DJ|5f$FM)4l5`NtmI30Spd
z$r8bWgZgc{G4(fit=Ol``jYb~smprFxy_kd`967SrvEi5EZP^a-^{@L%l_Q{)VUg!
ze{PzWh&Sx{ZoBd2-@iRa49fOMvp;<Ihw0;CrOp?1{2oAus+PD$l%yn<q*^5xr2;7i
zBLhP-T|+}%BhwH=Gb=+=D^p`_14AnVgYy$t8KY>(%}>cpt3=meXk`S|u=mmKH$V*x
Mp00i_>zopr04OBpdH?_b

diff --git a/resources/icons/colorchange_add_on.png b/resources/icons/colorchange_add_on.png
deleted file mode 100644
index cc800b81e8a6355877fa8cf58fee3731540f5dbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 695
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S3?yCqj{O5tEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD6u8LC&cwX?ZDQK|Lu1F
z3#9(1u>Ehd{lBC4e=5iS1cv`9?Ekm-{NK>{f7gWnt9$>~IQ`$*4|2u&`v2?e{<m8H
zZ?XJeAo;%|;{Vn;|MS%TXAAv5x#R!-RsWM&|8Hsk-)h5pKE4&`ez}q$zhDOW@`F!*
z9^&l#)z2k*j_m}y+;4@3#v{j`y`3<z;&7k(+?PO=j7i?^E({&4vK~MVXMsm#F$061
zG6*wPEVVBK3bL1Y`ns||;Fc8NmX&Gka{&q+^mK6yk+@ts;jNUDgFtKhmqxFNL5izf
zwKe5Azt_j>dfTo%*MD>FcgxMz#tc&>wjKYvlkv2}>W3ZX<<oNC`o;-pO8N7-yFA@7
zxv+KFr1pECmPjTZ>P)+_zJD`=!SuPm-m%Y^cA85^??v;%fYzs559euLSj6?CPDVv#
z8OPo07q)BrukMjxdUaSr{b2Kv9pC;|`Sb4o|Mpw@<bSs;FX=2R&iQx7``e>uyeDVx
zW$1|Bsj=8bi@Q>L-?mjR+Ky$nt-EqlSb4pc^PF5&HlSxzOI#yLQW8s2t&)pUffR$0
zfuWhMp`oskX^5ejm7%GXsj;?!p_PHb`H8EHQ8eV{r(~v8qH8d;GO~ndkeu{n5l{nz
Mr>mdKI;Vst0C-YMUjP6A

diff --git a/resources/icons/colorchange_delete_off.png b/resources/icons/colorchange_delete_off.png
deleted file mode 100644
index c16655271a7e10d9d83047189086d4d6b509abc3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRXEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4<xzrFv=ejtyt
zz$3Dlfk96hgc&QA+Lr+Z*-JcqUD+RSOA2r+xV$|S%D}+r;OXKRqH(@-lA-ru2Z^@%
zaw``lZ)N4)y1-3+V$)LZCEl@9CT(4PuF0zOL<X}J=h1)cbGs*(a9mlaAyOE$BE&dM
zw%d!X{j_T4*7qg)_lwKl*WN#x#d0brv0e08<?`dE)Auy7Hat@{z9A#<J$9B!^qdO^
zk~kC?Jc>>iGH4#PT$HOWYUVmw=D)W4<$2R?NV2M}KA?FdtNTmJp~!15S*|LT8;MoC
zXsZ3%W24$-moh2c@9l*fmo+q>Gq62KSXA699k*xgMiDE{G|yhA4QhurtG<}@uu!C_
z<$>}m-=I62B~!k9UHS2l6URxP__|{b{!P~`Som^z%$(k+UE0pWDc5vL>wMPBh1~ac
zOgPu;&>~>6W*@_<iO>Frwy&D=l0S8q@B+Qm*U`007}-kq7#>;Nm&p5M&yqHoBEQzy
zY0CSzuP^(<bWkqf?To9x&H;m0wZt`|BqgyV)hf9t6-Y4{85o-B8XD>vnT8meSs9vI
xnHp;w7+M(^oS(SL7)3*FeoAIqCAtPfD`O*whU@kljsZ0=c)I$ztaD0e0ssxu+3)}W

diff --git a/resources/icons/colorchange_delete_on.png b/resources/icons/colorchange_delete_on.png
deleted file mode 100644
index 8f27ce9fe684cca59295bd787f0c564f14a56a25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 628
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S0wixl{&NRXEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZEE?e4<xzrFv=ejtyt
zz$3Dlfk96hgc&QA+Lr+Z*-JcqUD+RSOA2r+-+eOqJp%({x~Gd{h{pM;m+Z5H3nh+z
z^sn2?bv7he*Wye6){B8G-T{-?yj?a-Src12We>yA$Thpan!eyJ5ZE|lwT7;ffcnvE
zS;w+UCtS;Nk}WE(*0icP_POSv<^KD{Mb$yQ(FI4REZ!IK`2_R)UyEa!cz3P+`04`t
z{hZU%K_&mTt8UMEpM2aV&hod9dl<8x*4CJ9HxKi5&!3)Df4S#W*Q&b>yI22j=vX^V
zN2n)Lr+H5h+lo`osZwf9*@ahFFK4ad3^C7@C^<TDwd31lqpYfhYr1wVYQNRF|J>3O
zPrjD~3a37HGZKiN!`D`B)H&;x+upMdZvr^>@ujWVCAfaBxAC{SdtoWHFMjlkyh{DG
za*j&_)BC37>U<7=kI(V^<2moiw_|H`-C}#RDkiV9dRkkwNm};kgU!{O7tC!`5!kGA
z^GE;ee@5|{S6i4p0)jJVZr^=>`yT6c`+I)XS|^=q?fadV_WRo97S>|Fv|GC`%Kv5L
zl`d>pzF+$gFcwrxTq8<S5=&C8l8aJ-6oZk0p_#6sp{|i>h@qL4p{bRrv9^Jsm4U(e
niK~oJH00)|WTsW3YcRAjHic*qn$hP0)WG2B>gTe~DWM4f)HnL<

diff --git a/resources/icons/down_half_circle.png b/resources/icons/down_half_circle.png
deleted file mode 100644
index f86a2932c1da84cc5e4b9214b26e04a49542af73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 631
zcmV--0*L*IP)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0GLTc
zK~yM_rOqL40$~sa&^LcE=$eXN0#3jwdYL9g>=j6wY<dA4$XYZ6iy{aD7E@@|AhsBS
zpxe*Ryl*D*%~9xTle8>Yx57>K1)u*YSQLCnrxtjJS&=pv;pY$dTN+FA5|tC)r3t?7
z#8at`%Ao_oMjA?6ya>;Tn{PLl>!_?;FXgL84|*7&kEh?!9t+H*c~lM;a|SCBFkA-%
R>c#*7002ovPDHLkV1nhP51#-4

diff --git a/resources/icons/left_half_circle.png b/resources/icons/left_half_circle.png
deleted file mode 100644
index 3bdc4c3eefbecd5a7625dbb118f1ef39e879fbd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 651
zcmV;60(AX}P)<h;3K|Lk000e1NJLTq000O8000mO1^@s6D~djS0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0IW$w
zK~yM_h0h^w0s#;O&^PP~DpoW#l>~(?C#d28Jphg%k%)>W?G;E`!6C3*rXk@BgrEk|
zC2Z1#9sA$R&xCq%AyoPp2~$ikEFqVA3Iky-%!J3wVwnq}G*I{y-teF?rAoiv{1-y6
z?wqxSe;`boooyE;x55h;-UlJOF8p?ZZ5LQe$J-$7u)?Vo#Frz!r40^k6@(o=q#tR|
l^|NT|eD|dAf>(_3d<GT-A3o+RFB1R&002ovPDHLkV1h#O7d!v}

diff --git a/resources/icons/mirroring_transparent.png b/resources/icons/mirroring_transparent.png
deleted file mode 100644
index 841010fcc14ba7f06f09feae3affb3d9ba64c0f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 93
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQmSQK*5Dp-y;YjHK@<lvd978O6
mlM^IZ7bl4HGzA*8Ffg!gXJBNMxf%_WXYh3Ob6Mw<&;$VORT8}b

diff --git a/resources/icons/mirroring_transparent.svg b/resources/icons/mirroring_transparent.svg
new file mode 100644
index 000000000..c0e831cc3
--- /dev/null
+++ b/resources/icons/mirroring_transparent.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="19" height="19" version="1.1" viewBox="0 0 19 19" xmlns="http://www.w3.org/2000/svg">
+  <path id="rectangle_transparent" d="m0 0h19v19h-19z" fill-opacity="0"/>
+</svg>
\ No newline at end of file
diff --git a/resources/icons/mode_advanced_.png b/resources/icons/mode_advanced_.png
deleted file mode 100644
index d98d8f7091d0fcebd33a354a11feb8cd0a08f5bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1466
zcmV;r1x5OaP)<h;3K|Lk000e1NJLTq000O8000yS1^@s6up4}9000FMdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Yww&N%a{MRaG2}VK)mc#R$-oY$?3hX>@uG@Wk
zLSl>p0;-C#ssH<H&_DRFq>a2<3@L;SAD?{UjGMUapS^aQU)Sf@Y`?_G`Qr~pNKnh(
z4E^Yz5!c56JNmow8Yinqo_Hj>&3q)3IWyzt=ogPf!h8I-5K70m?4Oo?{8C$s-`vsZ
zz3mNPG(|pP;x0}$T*I72umXvaXAD;s=IyxmVz`Q=&)Crp^H=chcW>Bj`H0Ia6tvwE
zg*S|jxYN(rErecJd(8auhm1SXU$7ga#WDK6yX*sy3UqAhwv}~<js;N48WvCtKgGSR
zl29VHSix8Wn+2tkOOAo&aNaeS-Ee)?)m1Ffb7w=%Tv=8uigDt)Nb$3{!6r!>fg_d*
z)&ya`uf?r-)0(fkh?$#1Pj*P=CY$etJ_UbL?uo{j(sgc&J5G=V*2PoPSjJ>-UeODL
zxN%^r3*S}fNjKXQu>uBl!5p!{yp=sgQTNc6ES?4Zbn~=}esk821b_&0D;DDf3~a%P
zy5KfrHs^q21V0%oXYpLXfK%n>Xn-4$0CFPFxiQAv>dVS|7}f$JR00l31Vb5Qd9Toq
z`3MbV74@X5K~1A3%|U_>8bYuzJt~`+H??49(URpT(MOFTT8uHpoHz+AOjAfkDW;Ti
z#-tgkGe&3h$hmNl;)|A0ti+N^u8>dlRcokLV@)+TZqji4TWCftw$yTW9a8GPYY*Le
z?5XDgtqmD|=m^6`9BJe`YwkF<FRZyY=FVAj2WyitzxvsOHH6J>DcrOZot%L&_705O
zWB`KZ$=Md2_dJ=KoNbA5D3rmP(@9QqlQA&pyJH>h&fSB#Q{G7ZAMwWDF-McS|ART2
z)E&%y<?RD&Ew3kvEQ01KoS4D}VQj;@oO-j-LK--Z7V`EKuuuj|25eb+3O2UFt!efH
ziyR*7){vxA=h3*dT&4HgC1G*MpxD>|2|92MxiqfcDo$R*o=rzD-bN`nu72!II@%VS
z7Ce(Ic<DH+Uhxe9|E$~XQTu@<V&u3b+M6^tgGg2$u{n_e_Cg1S)~b#SN^|jPn6sX=
zx8Sf>a}{V~e6CF`7Y8>3M!AS8cF)pzi=nD7d8XGaqct#|Z3gbmQbTUTfl$U-0iGN)
z7dT{`H!;u0|50P4?y2maYNE9_8z-v)iWv|?u?2O9vK#08L;|+FVfPX{#JQ(iXluNa
z;ETi429JoqSwU`YZh*Ch(<JTIUd=8V#?)5Y0NIYSrgTs+-$0HU1F`Ac<dJBhvLXO9
zc@XG*9o+>jPhe|!uz=l0Yb{k1S9s9avCh@sS<o0qjEuvr+zVtGr!1FBZ_Put5NQEk
zwbzIjtsC049t_~=ey^Vu{v!C9s`w>%o^q#;djGB5ZxlQPPv0p1j|EQ;#V>`w9f9kD
zr*9PhS?+IQe^P&;k9z-J?r&nhtH04lz5h<`AH+@{)czx})2rI=>h{m_zan<}p!RXI
zmfy+!Zp#SJ;{ZJA{j%I24o?q@f71I8<WAS^{aoyH-QLgLovz#axx3SKdp~z~x^D01
za;NL|elB>rZtv&rPS@@I+}-KAy`RgSuG{;$-08Z#p9`LT@;>v)-RZC2XAZg3b$dUT
zJ6*T;bGg%Xdp{RD{q$Yt-Q8*Y&AZH#yVG@hKX-Tfq<0y3!%vX?fA%);>rHq<8UO$Q
z24YJ`L;(K){{a7>y{D4^000SaNLh0L01|Wn01|Wo-ew<o00007bV*G`2jU7A2rnps
zAi?AS001gUL_t(2&tv?5jOjmvupI*fr#=J2_lpb+Zx1mb111InU{t}V0_rLN0BO1g
U?neBJ+yDRo07*qoM6N<$f@EOK;{X5v

diff --git a/resources/icons/mode_advanced_sq.png b/resources/icons/mode_advanced_sq.png
deleted file mode 100644
index 6df2a52fe837117ff0646670696efffd5f6a81b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<!3HF?yX<O#6kC$Fy9>jA5L~c#`DCC7XMsm#
zF$0582?#UZOOvkv3bL1Y`ns||X5`|qG~f2QI22@nr;B5V#`)v~iHZY1{!3i0XG^qZ
wWAm$JYkMy)DREEEDe!>HiI#^86ATy_JUQ8}xt6zj0JSlAy85}Sb4q9e0I>ZleE<Le

diff --git a/resources/icons/mode_expert_.png b/resources/icons/mode_expert_.png
deleted file mode 100644
index 4d78bcccf511511455f4de48fca473bb2d0aa677..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1379
zcmV-p1)TbcP)<h;3K|Lk000e1NJLTq000O8000yS1^@s6up4}9000EEdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vrlIti8h5u_6vjhYPiRJLDnjOsY=is;#C!O&f
zciL3^P%udPbTBmj`Fqk|IJ~G)#3|*J9FCY{_60ZQZpZD)E^g<eZ9PBPiR1o<hbiD1
zZjWi~{R`~!ctQ96T%YZvZ6C+>fxc$m2MlXwkDI-p?E?jWvwt~4d4I3OgX{Y*_sx07
zd#Bgus7OW^j2Arl5jZ%U)0!o~gJ7X78_qs>@Amr`63$`udzU-9rTKgE?sqS_b7i-O
z=TwmU8YsQwXt%Sx&)t@xCu)zGpZ=Kj4*FZ}=Il1-xJ6fDLZ%Y!L4Ad?-JxSeD#P|#
zLR0(%_qw%=W(cu?SO?9D)`&BEWOH)l&V?tB?b^7(#ps7uT)l5TY&Hw(vu_)exEfEd
zA%{+2<U<3s0JFdQ!rQ!go3F89=FaHp8H4en`P%56@h9y*(44DunVsG8gtCBNe$_PG
zSmf3jy#R#go>STKyEQu0jXQu1AShd!4FMKcZ$nh!M{R|Tb3i|Fk#0rrSo=NzQiQn$
z&Ts$$mpBL~cIv${Baa3?1)lp5eFXs)@ttXc4eB0n%&)oej`G&mi@%w%v;c%aA__D)
z6u^p6P(K<CHB=->BoRrXVv?n#kYbXQlBTsr6%86yG^wg-)?&e;i6v7r%T}__0ZW+V
zl$EmOoJ+x^1w$9SUC^VH>T9U6N=;R()m%$M`Lx)irKZhVZl(JkI^^F|SL)VtFM|h4
zX~ZET4IMV}C=<0d!;DjAnmTRfS?<($m+ccZej#^GjdyB`Sls&QgBr}LUqkR(PGm6y
zF&`PkbrC>8`^C%|$LJTi#mr?7QHTdMmIbHtA_jtSu$Reqb`Nr=+(_ajZvMZ>(L(nd
z<Y=MW$$jVchFUM%7bR?fmI_x+U6@$dW++9QOtsm4&T(2DKwt3XMCxFSC2LETOBD}s
zJCMk83@fdc9<8n(O0yy)?^Ju_tU9r>wbj`a6EwIUYTce^(%HhyJtYXSH{oujE6-7#
zc29+ojS*%~4o*N)C29(7mOk+@E#3;e%q9^ZDOYS1tfWpP##YK`fE|T_59`s$6Vk^}
zu_Ot@&)Rfku~t*SqKisE2|Pkr5mY~JQGUf}#?&VYSUL(<YnX#)8#VYE$5;W4(DS;w
zIaH9pSe4<iuhMju#+cnwN!2DzF*qfzr;MOy7!`?aD<UhXCl>F9t-{FIKVa!WeV2;w
z1|mWQve~?mqE}QYEK)H&fqIAOg%T~tH&D-*{sie8Bl;nvZ;a>)q(><N)149u9h~R|
z)Q;(okk+72l<3EpUMSIfOz-t{CMUY0r!zUxN2m^@=!%}s<V08WbS5YI0MrvFx}v8u
zInfUxePcvFg!GLOUD4B-oal<4&g4Wt#`Gd5x}v8uInhU`4y5QKR0mRYMNemPqAPkj
zlN0?2)Eha`6+NBFiGFDh5$KaW#8FOkMNemPqAPkjlM`Lh)0v#;lkMJ7PV^C~11b7s
zyLXfmeX`v<%85SN?j1SNC)>TFoamG7-jNag(jFqvC)>RvC;DW&cceuB3lrw)**W?b
z+PYSP@1brk00006VoOIv0RI600RN!9r;`8x010qNS#tmY5_A9n5_AFHW*>L}000Mc
zNliru;tCcBE-rCcRgeGx05C~JK~yNuW8BWh_Fw1MF9t3d6^0K_?l7EXfB+^228K^O
lJPb?>1i+|*Q3cdh002W22;H2eLIwZ;002ovPDHLkV1id3f^Pr-

diff --git a/resources/icons/mode_expert_sq.png b/resources/icons/mode_expert_sq.png
deleted file mode 100644
index 742ffc08891d60c465c4cba7bf33cbf207579870..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<!3HF?yX<O#6kC$Fy9>jA5L~c#`DCC7XMsm#
zF$0582?#UZOOvkv3bL1Y`ns||X5`{9kU8CJ7y}eC^mK6y(Kw%+AW?B($K2kx`_HY9
z=ZP`W;*p<sC((j?YC=*%!jB_|4<B$j(eiL%f&l}A@>!0fTkU4d1!`vSboFyt=akR{
E05GC4r2qf`

diff --git a/resources/icons/mode_simple_.png b/resources/icons/mode_simple_.png
deleted file mode 100644
index aac2b61b042094981b9e8f37da32662fb48b8c5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1164
zcmV;71atd|P)<h;3K|Lk000e1NJLTq000O8000yS1^@s6up4}9000BydQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vrlEfwqg#YUlIRX+0!EwMqRc?^ur?Hv0vx#Rj
z)Y^=UCAq&gv(*3kbI>37h~q#(EyWz8!zbjBrC^fW@j1@y!hU>?&F?R9;;=3tt@Akh
z<7@0|eL-9wH`rRw^)*hmtvqQZx>a5Y{j4mQtaWK6@^Zv)jZj|qmGIR1`pa!^-tk)W
z{yiAPXo`GZNV;e5aE!BxM+ZLnGGjQ37jbJIyzTLLt{ojRe~NdXy=mvliu+e7$lVgf
zH;q=D^<2AMp%-e8$}bnTbT9Ft-54#6(T}GqAwsE0>!EIsvd^%vLQ22i7BLKein;A0
zV<bG{24W2~E5=5gS)k_Nz>NzJ?)!P;4J`)gVmOOz;`dncCRw%}N|=L(n9sfu7>VCN
z%_A)LUU;vY_j(&ARBnuw!brxG=KG+t;5Xx*XpCuHW|t0~U<>pm)6-~UlAA}Y0uUZc
zQ{DC52R-@5J%RNgsJqMw4_I71QdH%KxBSl8W1YG{hv^+#TL~Z$YAc#y4+1W-SB~sV
z#F(LD0-u7;#RsV%z^c-i2H1EX0Vm0<jeCsuwW4x_v9$n%`iPe#flvXg5ETBgkl>-B
zUIVFWRMVtcOY|{BjWJrBdsH!R!PKIeCCgTlPa$cF$x=!=l`Pp~3)394QBFDMQc$!Y
zb-~>QD@v(SeGOG>tX5OawQR7@7B=1DW?S0wR+=>5@cOsdj9O~BmChYj>Y;0o-FoV|
zmjSO0Kf=%vhmADyD0gbSUfUOH{6_9)YP_gTVqsrr4{8XT-BR$}PINK@F$oOfHVMGc
zGMTx=A;=^*nYk=@DO5m>b;4;piGg6~EIRnk?m_NHZlvK7H~A-WG|~MZ<Y=N><UYBb
zP-|uXMe#eJ`4&!1ogdiP<}I5R8>RWtds8cwV;;SRF>2M3%U0w3fzW{81y@op*u0!Z
zpoyd634F=KwfBr`$w_W);Jq%5@A=GTKAZWpS4$mRT9E`5us+S1TW546KlbCLC0DbG
z>uHLZ@mtH9;DOZv_Uzde;ToE-m(s}m)?4cyJLOS(uHR=*=gM>|4%e<6kM07r`4?&K
z%FvSLJ7J!5p-*A<-u|mJcV*~9nk&LQL7`vB@?seJl`v1b&~?Y08-}hs=G-v!wKQ*r
zp<fB})EoU$n!91>x?|1_L)RU1ZW#Jnm^Z`Fcd~pMhORs2+%R<AG3SP%>y9}$3|)83
zxnbzKW6ljj*Bx_i7`pD5bHmVe$DA96t~=)3Fm&B9=Z2x{jyX3BU3bijVLblP$@DkZ
z+afZyIfuyr000JJOGiWi{{a60|De66lK=n!32;bRa{vGmbN~PnbOGLGA9w%&00(qQ
zO+^Rd3Kj@25=Sf;RsaA1DoI2^R4C75oO43_zpx}T0~;$d!>`|e8Qwns%YY1+7zlt-
e1)~b6s{jD4<_My71_K=c0000<MNUMnLSTY7el2zY

diff --git a/resources/icons/mode_simple_sq.png b/resources/icons/mode_simple_sq.png
deleted file mode 100644
index cb8ab7bd46c8f701ca331e95a18b251054c0cf03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 158
zcmeAS@N?(olHy`uVBq!ia0vp^96&6<!3HF?yX<O#6kC$Fy9>jA5L~c#`DCC7XMsm#
zF$0582?#UZOOvkv3bL1Y`ns||X5`|qGM=^hNk7N{PZ!4!jq}L~5)}t5p11s{PxMS<
wGYd;=i{Jm>Xix1waaTrRMd7ygrh^O&r^`9I`v3VK2Wn&RboFyt=akR{00Jy79RL6T

diff --git a/resources/icons/one_layer_lock_off.png b/resources/icons/one_layer_lock_off.png
deleted file mode 100644
index f6e61d058cd6b9d384d80e95b5689b4a8658b1ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1001
zcmV<F0~Y*=P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0t!h)
zK~y-6h1AV&Oi>ue@z1?;r=>zE+9su?6S43Tu_%p%zkrHJM37X(%2tFBm55l0#9uH8
zk&slPTRRD1!J@H|CQ>ieqOa;@w9{UTJ7(rih~MU%Joov1&v~A6?g`W=?$w5aIDj4V
zVO?`}ac&r|Fo1y|?^CrWs4{190+-QI3$M~pDd%307ndO=z(w?_YoPlWdry(cGX0Td
zO=OqyqMt{%D9jdd9yf!$#i&F-iA$h4$G+2y4=0AP*EF`$b%fk*p5CS~8{ry0;9eB>
zT8-<-fcj;`F+)#y`;xgI%zk0XavD}vcc30O;$DwKY(-PK;^|SojWhW^0sPVAduB$H
z@+xY>p$MB(ZEM>?7$s$Oc2S&DF0-+fj-9-DUhU|K(2|1m^s%~~ruFPPN|>SeD;XPB
zC6H@-svX-S)TJPuUCG$k%Gb|KjU><&rM1>>Or;lts3pYDR5Xq&^JjOtbB3pPDzU<B
zDm{vepF)hMA&Y6l)Clv1zkg3O7~*v*6a<xdbB@jXShuwj3p2Hlfk^UCOe!C96(rZq
znhi-$%8P{6fD!bELEZ!|U;)WZ{XWUe81)UbY)X!NW-Pfs6Yt8!;%tyN`sdo`(T<DG
zb=Ge8U%G<(5JHeQhpRY^xBoE@;W%ytd5fePkf`*Y9L9cZTL_}&Ok5nrARgjD?R)YY
Xj6RxdU;1V^00000NkvXXu0mjfDR|RY

diff --git a/resources/icons/one_layer_lock_on.png b/resources/icons/one_layer_lock_on.png
deleted file mode 100644
index 01109997216d196901e570e6a3c09fb400d78db8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1106
zcmV-Y1g-mtP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0&_`3
zK~y-6b(Bj;l~EAKf8Tc%F-z%&Ud<O76_NN_SRiPv1BHqnizo^OxeK8-fuXf9a}iNs
zyB?4P1}#$Qfw>4V+L&fRh&|M+UcJ7qZ*PhJ7U$-tVgrXW%>3tn&I~gHn?zEwB(J2m
zlE!4@m!xJ%rII|GW2|+-k-&MNinjW6x|?9I8$t`PBOa17A-5QcO8bB+pwY4{t&xNY
zDrtXIP5WcmeGm#SgDVn(BM{?;$Y|(%0sWnD<@E}14Y+Gr*6Kf!GT;Ff9v875xbzSv
z`l0ncjP^oYBIKWev}}0lHRN^QL%;>gvKsAhj<r<hx|j_>R18Sa*8u~cU~U|SzCh0_
zm>4jh5Bz}JN27o{l9FuT2rakV40fC11pP2S0aHHsz35bL$_F!klO90tduXdq22R*O
z9-mtraPlFrBOqZfWaL9yjyW0mCav^52ix@$pd<oFW$3HpD5-{BY2Z$U!{@+u!Ai*7
z+jbg~ngWCM^#Ei=08xY%9FmNDbH^pZYyhT*4QXt+J>vH`*rgc&j}6Qd<6hrwj{fl(
zG<e}dgJWBsbM)vqfH52Jlem8!$?C>{>0$V@ytO|y3!ujay2w86I4sN26ZXP^B1p+}
zY_`kMbBh6*kmQjxsj3|5BGT%r)+F##>g$lEe2y)&U~sjCk~AbKDO?7XNm`NDZ35>f
zrJ!G$8I@)OMi2U>xp8Uan{+i@l9nW$1&9cL><N&@>AFhlPnk~rpX@7ulQjT0fakDr
zilZ=7e4W;N>2x=nc3+%<?QTfPg1izqR^A8P#7yzZmJfyZNrj|$>-Ncrq&Jevx7sIv
Y0T%OASmVe+!2kdN07*qoM6N<$g0ThsfdBvi

diff --git a/resources/icons/one_layer_unlock_off.png b/resources/icons/one_layer_unlock_off.png
deleted file mode 100644
index 46fabfb0501592fb64bb87d32eaa658fc455941a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0tQJ$
zK~y-6mDJBmR8bTM@Xwn!!w5b^R19(<gIm)?`v+#<529^|o3{M{J)*@6TD5G`rey{R
zxpFldZ6SmUO%mLcBr$@?AS0tQ<7?53Jf@WTuI@Sa-0wZ-+<U%(9wbRJhI_b!n;6Ac
ze8w`C<2bHn&jgvn1w6!4jQ5gfu-l1QjN>?kFhlSJFEMxp0StFCt(VK?^-86Z<~th;
zh-YSIOixd%)oOwuFfcG+YirBK#)dRavqX73$9F6SNs^4>3x?+B=k4t5SYKZk1cBMv
zS;ND_*4Eb4>-E27wU1kQ%wY)5&(9qk9Dp=U?d|Ppx7%8+)@7xQ;eH-dUC;6Hu{2GE
zVW_XKPZUK8g@P!GgkdNM0_}ENqtVC`-Ob~A*IHd&Rj=2TN+ol1bBe{H{{DWGlao$P
zPNZq7*=$-`TFR14<x%Wfhlht?WMss|!~{4xI?`&jlu9MJT&}mla4m;FI@WA9FV@@J
z+g4UqRIAmCl6z3iq1x-sA`C-?LP4=uyewohkF8#B5L|p@<KyE72M0w_1ai4tZ}@T^
zpYT)XnW52WI6FIYdU`5~B2g4w_-eIUmS7+614xqO5nkzx!9Svbg*cAic5{1!7ym&3
z&+tz7=1Qf~E|<$6@eR|i9>QHb#_Kqa+hnAmi;kW=z-`>{TTgyq6CbeDt0%tzFTJ+D
THHORC00000NkvXXu0mjfwn)tq

diff --git a/resources/icons/one_layer_unlock_on.png b/resources/icons/one_layer_unlock_on.png
deleted file mode 100644
index 265b926101933cce7995dccd8e0220bd8a862eea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1129
zcmV-v1eW`WP)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0*XmQ
zK~y-6eUv>&TVWK2pYO(ypL_8q%8fK)8q|Ow1xeaP3gYBe=pIUk7HWmAg_izoo$S`h
zp<^x7p<PnQ799*xut5;-PzYMN306Xk-u&R{pf@#Y`>r47`OZ1K?}1Aak%)*q6_M{E
zV#}F+ipVz+c_bp?%Qfmku@^`Iuk!hP)UqsW+osWI5DW$}O_Q;)F(xM`E#MWfq?D32
z<Q(u~b93|c`uaNi`}>zaYioFTm{cm&0-gi!l~SiJ<T3CelgW6-$H%EuDk!Ds?(U{g
zD6p}yfrzw0eSLk*&CS(;2TG|WB_cO~!s6m$Xm)m%?d@&W*49u;kw_%y@9$@2WrbR;
zc3nq%z-<k<ySlm>vTd8w(^E>NlDi{{#UiCriB_w1WvpVcNIsvB0QWWEj%8T@RI61)
z1dqpquIm_vf!FKBFbsmhAiA#O_xszRot+(kdtJcIa=8pZHk+kZs}YOENG6l`d_Htt
zXJTT4<KtsQgl4nJ^71l(+x4w3z~5{(0XR4~0AOHXfRT|A01giiX|-C!VlgyL>sWBT
zUIz$kKs68ubj<5Q0k*cbNT<`-w%s1tmCxq`ur**W6bfBgoGXvVgV*bI3p!+)Ccuv_
zAU8TX%I@xN`%$U3k%>m5^!D~*7zO~ErnTSV@i@R&4aiPSP5lms|3<=b92$)V)oK;P
zFo;AVIF7^7(GitO1vv9bGMU^1zH~TtVPU~@a&q#|(OmWP^e{g^?*I>#QlH%3J_7G%
zW@Z>19Q-d}XlRJ(>1lvBz-Q=8v5&J9zs%)wQOmL@m&-VgLm&{qG)?01IEh5U0^V|#
v;;U9Zhebr>nTTXA+>>7-k`|FC*WHsp>Q69+U?zjU00000NkvXXu0mjf%y$mq

diff --git a/resources/icons/pause_add.png b/resources/icons/pause_add.png
deleted file mode 100644
index afe881de8bbea4b942cc0e9ae35bfba53c9dc057..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5883
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
S?=bzFkEE)orBEYh5&nO)^r2<|

diff --git a/resources/icons/right_half_circle.png b/resources/icons/right_half_circle.png
deleted file mode 100644
index ecc8980b3286942886d30c3a170691e848adc9df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmV;90&)F`P)<h;3K|Lk000e1NJLTq000O8000mO1^@s6D~djS0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0Ix|z
zK~yM_h0mdCLID(j;qOdgj75uKd3}2VAHcjfSoH-4%D7=KAPi(LuxPa2tXNIMq}4QS
z$KV8q_v+sceCNQ4?EA$JCis$;QP}z`av+a`w8apg!ZP0Fjnl%N(8GuH2>-#MTcL~B
zeAB7|aE})aPj!IsfKELi@O%kC`x>bH;<WWOFuMd+DC@vZ`j)0uU?+{GQ4}`Kv$KcI
oQ4|)?l;&7thEkeFVRPKr106CjO{T?cO8@`>07*qoM6N<$g1VU`!2kdN

diff --git a/resources/icons/row.png b/resources/icons/row.png
deleted file mode 100644
index 18a6034fd597baffa886ed65145183a5627310d5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1923
zcmV-}2YmR6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV000GtdQ@0+Qek%>
zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCmh2`B{bv<ff`t%><uIO;9c1~r40e^Py7~=y
zKe4;aAR%;hLC~iC^LICY;jz|P<0Pn$-XC~ebkQbM^jOa->2UMA8^>9>^_xpz(Zwiv
zHGSLq3H|aI5Zvz1_kI(~wxin+U54kwW9Cucdb$m<UH!D%Chl>`J;B*OTejJ4{I%@@
zf>8zb*c#iI_`uhXSr{I0<b+c2wH)l|v8az{^y}BLGgtK`cvtNuc1PO%d=G^={8sQU
zG1~nkFa3N?V_#W2XTAwiIl}S$JjJf}s=c>`E;)}#d9y*CP-YE^8KLAk%;OFC3F=|K
z5w8Mb0b><xX1v8vB#UTwa#Sf%r#8z%1ui<<EW&NAEtY4WBK*;oNs1dUbsIoWHLT#I
zfHg+9y?miLZ=CZLQp{WlnwDT}u=w_xuR4F{y$tm}mM+nuSFGTd9cvnH4CclcS|Eh_
zj;YM}&euGxo8yUC27@xgtN@sfyi8=F$J*k_Geb`fXO6WsDAa8LA;R1OXNbYT;faMj
z9l_c_gg7erN$}jVvl$GKh^=HgxMB7nN9~v!V**WGD|U4wwSWj=&jHk61A#2(1nVa_
z#TrV&;*5xR38E4udG^kW_dfWMqf+4Df&?Ez&=5mXR;Qv~gQ`YN(MCoJljvhGQDclL
zVbTQC38ND<Qpz@Sc3HB|A#08~6)d0PiWFZ$(Gp9lwsOVxuf7ITwZ@tnH7up(nl#@+
z(-vFmSZkfT>(YG>U3={5Vr{c}XN_K%`<^x0tPRH8)C&*R&>g~Qf<`)#!5J8{j=*>r
z3}8Xq!P%kYoE^*!&W>oYDa3*`l0i<T!5A2HjjVLKxO*`7EpJBLFY#tSF=qyKe}XwP
zsN2lF^Y#U6HO&)+CqZKuj+h?Yk=US=tl|%8@%KyfUkosupVeHE*h=ACR})^!R7uq-
zts3_58b(_8c#2NQ;gq$b7$+noW{L6?S<<azPi5XB*z2?6EeK;;_2Oc8T1U%BBWf`=
zSEmf@gy>~Wj#K!Y^M|GRS;c!vrK}pckmGR4kTeUIs5#m$l@Jfwcz(V#zdB%*-p;@{
z&0L$;Nq;}I3(mEZ$j$}FlujvxM;AT$`>r%UQuwY!nm(5in*!(hIsNi&ud3RXZ)pp$
zSG2QV!WNGn>(dHd>xiq}wqoX{+DVpvQ7++aLD#g6OX>b-w4wFj`cYopZmnHz27ov&
z5EDbYVJOR^3q<=2g57eW1;#aGgHH#V8;toH4K8`Jl}d&3@=}pfYw|Zxy9G?<C^?>+
zsK^?gJuWRdZ^M>r;TGyMwx;$WbzHnR+oX2uy5DFDarF!UONb2Jf_vlM#f{w;Bs8QE
z+5XuPwKw%8geQmw^0j~X#Wyz1pz{?)dT67m@{lr6*c*tjg=V1mlmY3}l6LO{%-17B
z-RS~5Z{`bWI1M~?$8|MV7PDs-OD04cvU^A~ZUHMPBAWzlulxR?oMS80WF^jEN+huL
zrk<8h(j|rBsl?qxB1`(FEp_E1tdZCxcFuPg?hb=b7$G7r2DyY7ZOt=`a3**ihxJbI
z9tZqVy5MX8VWE+}=pQ=<lrGHzW3j~@!s=ru#SMLr6HHEN2PMRaOUA0>-$N7Y_OZi@
z=tF5w2o#apMis&FL3ii|c!_OOF@z@JT9LNYQDc2QFIw3yVCUxp#&_7Q3pMKNafE2*
zJDmIk=j||hL$Obh31bl6A21yL`M$%Dhfx36arDtpD7D^Vd@h<5<Ga+?y@Ax9n9JDx
zw+jaQz1w!)J^a;k-b#-1Vo(-#SB8$6N^W0J^c?2x;|?@#q*ogGcx5tw;Ij5VF~qpH
zM)NQ8u{BlU+MT=r000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B
z00(qQO+^Re1se(>3F|1d^8f$=eMv+?R5;6}lfP>eaS+8nyPOg{@Cs48h+uV9gzJ*R
ze?TEk3T?&Uk3t2p5eq?xjgf;uuCc!qDe^a@NFkU)61#ALG>U<sS&Q9y&tmWPZtad6
zm|}SIee-7KJBe*(v1Iv0|LM}5&WF>?O&gG~L@2O~EF6Js96?B2zL=jM9-h43{<yNy
z=qz@+7v`Gj^|`4EH_x-^0vnAicbc94nOgea+$liAVctKuH8sJ*wE-o81;D%AG5B@~
zp6{$y@uzz|di!I1bpb*FK+41x=3DhD?fEtUqfK4CG{#g62}Vo+$7gkdgX4o5!Ov`h
zAWG%D`uxrRo21GkqUJ?W*tYM#*|BXJDitJ?J+I&0B<Zb`9|h2(KEJ;|sqj{N6G;Y0
zi#)G@g`2l)lDTrD7Pqc-s@x(k${Bdn3$TCmwNCJBP>auge5rD+;k#$uJ=<nlUw+vy
zXK->f*m}I4TM;NkL?DUCb0n2FpujP_3yERzEr4X!YfPEZ{sG~-EP|Z%oVWl0002ov
JPDHLkV1lKIrrrPm

diff --git a/resources/icons/shape_ungroup.png b/resources/icons/shape_ungroup.png
deleted file mode 100644
index 97aaceb23d4f899af7d44f31934bfd3418e0b04d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00004XF*Lt006JZ
zHwB960000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw0004x
zP)t-s|NsAqiHV1Yhj@5+adB~mhK65XUqV7cI5;>bCns=la9>|vRaI3pGcyMV2O}dR
zA0HnY8X5!y1ONa4h=_=Db90G_iPO{5goK2y%k`|t^{dGBsm1lD#r1D*Z^_BYXJ==F
zgM*BbnZVWezSZ}=)Azg5_qx&deS?i-V`Hqz^}p5kzSQ@;)Azd4_qfsbx6t>s&i9+X
z^@E3vadB~Vd48|P>$J}Iv(5LJyYoFgJz`>FgsIntujPfT<AJK<f2QF&Iy$$vw=XX*
zrNs4gcz<7CUt(oynzq}azv`a7>72UgnYiagOH?c@ENg3Pc6)<}ujQh^>!7~sp1kOr
zy6Bj<=9RSNlCk7$mfFU~#$8=qn!NL$zUrO3=$g3bm$v4Vv*nSo<d3f7XOY=iSy_Oo
z;+D1Mle6TJuj7ra<BO`{V~yB+rQwgS<BhE1imBm;r{G_S)h#V8IzLB?tKx~N;fAN*
zEHpw23JNPLE3&e(At54al-g&I*j<Lz2?+_Nrltb}0|5a6|NsAi^P}|u000zpQchC<
z;?}>`&BV;i&CJcs;?~Xn$GgOfc=y%-0004EOGiWihy@);0002NNkl<Z7}H~5zyORQ
zOkkQ>lm#LnCN3c<B`qT>C$9hzU{zF7R#8<`*U)5x>e15H(bdy8Ff@W0BCTp{Vrph?
zVadR5#Q_qKQInImwz0LdcW`ua1_`+6ySll1czSvJ`1)}I`CR@1=7B-MA)#U65s@GT
z3Q^H9cCm5s35iL`DIfvvR33&jZ=dvx%&hDjm_@lj<$3u9g+)+4Z*fUda%ow4MI|3Z
zpsKp2wl1frzM-)RBET;o2&RRag)u!30LOeLiBJkwz5oCK8FWQhbW?9;ba!ELWdK2B
hZ(?O2No`?gWm08fWO;GPWjp`?002ovPDHLkV1nO6dG!DQ

diff --git a/resources/icons/table.png b/resources/icons/table.png
deleted file mode 100644
index 3bc0bd32fceb21d70368f7842a00a53d6369ba48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oR5;6}
zlif?gU=+sv7bPi)=!3$7q?JQqQvwMoh(bhK+J{k6%rsgQVNn!z(HBXQkd^mAH(hwA
z^Yotc=4S08nh!j@F!ub;!`WU30603a!#SmnFKE?TaOVx=ZRYd~NSn_P*eHX4{Rzai
z68Mrum`pr?uyhCB_zlR(s~YAA5Xn~cSpFUUYax26696aMv1k4Q2q33l!H$M!&p1HZ
zs?dXQ!8A(HJcd!rMboIk$jLW=EvyAdm3{&e#VDQ4W|M-siV5fsA9Db1`>zJNu3H-P
zO&@UpeyZQXi7jKe-Hk?r-sue;aDce_XqkvXP+W#F_*ot`jB?BS93Uw71|U^ZjLH<w
zh;-sq3Vy5@0GB_@0Tc0CO9QIe)}UUmTN-qU84mEqu5JAXPM->`yP%FO7U<6!nLCG}
z$SDlW<k^-FX;JQ=20hXqbO&;*_AZ;O0?VLP0(5*EI|Y0J3Jfj)lKW#`00000NkvXX
Hu0mjf{J_IH

diff --git a/resources/icons/up_half_circle.png b/resources/icons/up_half_circle.png
deleted file mode 100644
index aac6e32c3f307b8213131c629c9a28eec37630bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq000mG000OG1^@s6@OFQf0004nX+uL$b5ch_
zAW20-HZeIiHZ3wPF#rH4k#&*3FGEoj$3Ja}hDrw=3?z*-20<uk*w9E35h)VI(mwqm
z>5rH9Dk4UMwL=F#Vj*HNvx$E|B9UM+u!@1iBF%Gd+oU3TUe39n_r2$wci*{SUruWo
zvta--*}M@BO?a0hE8eCToOFu!(G}H9eSCg?mb&)!fK9FUeX3Xeynn4_J#K1Xa|(}X
zx{(*25}w=2>x%b<Jz6TdE_@-}YsdkGpOhY}@SEafneD2l$5;#pg+0RF<S&l>Vl8E4
zgolNFne?VsJ&*bmS3JA4pmgyLOu~eiz{@m~1PL(6sKkIw$4|e!QK#NtuAd_(wVFho
zZ45R@k|Iy9sGHI~E^9*cxIAge5L0*XceZ9?$Y1$_YX%x$E$g!fnvS5fXIbATmQ^|h
zhs@=sSgX$!VdP!(LQV4>gL@Y)uWMTD46X{${;WrhXjyWI+Y<@+IEU5<wB14TYGrQK
zeNG=?aR+8^;ouOuCEvaF14xQzSa)4JuK)l532;bRa{vGl{r~_G{sEJZ{KEhM0INwv
zK~yM_ozS69f?*VZ;pcomn=nRT6oYe&WR)u*nMejA?H^5|!QhlzV6%85TndG87sO)#
zW<g;*{XJ*rgoB(59Zft4Q#@fHBsN&#TiV9L?$`z7tD@3ZnF+PfbxPV{i7#OrAF`2i
zp`owxDLkWfGTyIi;YGTa-mxw^nu^)k_}7gvMxAeZ<#2O-VSLoaMCGvv(?4(iPq@RV
k*nj&PfnmYm$^mfu1L5o)J~3RU+W-In07*qoM6N<$f~}AtK>z>%

diff --git a/resources/icons/variable_layer_height_reset.png b/resources/icons/variable_layer_height_reset.png
deleted file mode 100644
index 6e051fe95104027f06f524c7e60e090dcdc05bce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1050
zcmV+#1m*jQP)<h;3K|Lk000e1NJLTq002e+000&U1^@s6eW2=d00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf1FuO$K~z{r?U>7J
z6Hye#zf5A2rb(MV6k01<Nvx)#h`34X6I{erZ54b~3Kne;gmhsAL3i#%NDzb+{0CgQ
zX#$GkE7=*JD-)~LKGfQxwNIMndS-HyG-;BViVD?y@R8hm=8&1+J@?!pDgca}SDFO=
znOB<fV6y19fzfL;{M)}FMPODJ7o)DCf{zx;YAQv$*^GweEBMUPmn;|&%KNkD@T&a`
z>dMRcY*JQ}3Bi`bxVCE#POqs!t-;76OIta?#Gyc|1#~*RY&!*OSs9OVC<hNgZ74zk
zRn#$S9d;8uK_wn`OIta?e4d=d+{_GEBmz}op#<l}(G$|vk)RxCfnYR1V=Tt>$B&p8
z9K_8JeTcG5ZvZy9LJW*zNqf=3qkmF1R|w3zxL?W%W}1K)uDdb&?Hi&aBM=JpQ0esu
z9y*Mt`<o#c3|M9~#-I!gqUzoq%w~j=RM=e)6;+gIhtCerB5(L_Nw&vK&qYw;xq+F{
zQACEnKwYGVwz3Mk>S}^wNL0$o`*$%Djq)sI>b~s*ELN(exYDaCwW6ezPsBoSB@(mc
z#peA^Ghp{fu~0HeR^k%NTBlaC@#7~MyLg$g);7kDwK8`80vp-0muUqdV@|4VjBb+A
zjirpK#1q$acvHs&LQG)vD2%AE5c4v6;6yy`oO$u_ytop}R!m$qblRu|YN}L0n4JY^
zn~7Fy)Tp7}qf}<6pRcMPjXkuj_I1YsHW#|=VYsjGF)7e_6+Uw#jwBY@j^^~8rzmgn
zQUqp0NeP}dHbG521`&c%RYk6pz-TEJ*t!k13gIMrjKfEeE~PbJGo1eUTf##qxB{K9
z)VpEv#A2yiB1hgYN*0U+WnU9C1VwDLQ`AqsK7WScU=S01AD}BMg|@U5Pd08st$3^}
zRreLR!*+C~JfIH_-k6iNpfkY3A{=SXfe=+*vTw`e{ep6Wk)YV)P>L`$Fo21nAyhwl
zfK`Df80+uHkKT9CSCpfW-eVrETaR_i3V61h0_eOtuWACf(6azkHoeB1F#oDFFQv)L
zD<_!c1qEQyIch~wf-;2hPXy)hL+SJpUGqGM?*si9d)o^^5TGJgkQJ-@Hm!BMZxAR;
zJ$f4BJ%~Hxiak(=ciy}o&X5DK_9T-hUU91jVY3r{n*VL5()O})Hr8~I4e!{Q@$}KE
zRIG2UnSI&3h1s;a1@R^9jFTyDFqv{5$s(M83<}HtgO^2%XbAt8@?f$k4<@64pX?TS
U6@jyFr~m)}07*qoM6N<$f;Z&d_5c6?

diff --git a/resources/icons/variable_layer_height_tooltip.png b/resources/icons/variable_layer_height_tooltip.png
deleted file mode 100644
index 18200529278f5b24de50c01de9121a884db25052..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10017
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


From 34f5dde024839adecb919e07aef5edfb5dd63a07 Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Thu, 7 Oct 2021 10:37:49 +0200
Subject: [PATCH 4/4] #6380 - Fixed non-uniform scaling of a volume using the
 sidebar fields

---
 src/slic3r/GUI/GUI_ObjectManipulation.cpp | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index b8c053f88..d5a1a5659 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -547,8 +547,8 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
 		} 
         else {
 			m_new_rotation = volume->get_instance_rotation() * (180. / M_PI);
-			m_new_size     = volume->get_instance_transformation().get_scaling_factor().cwiseProduct(wxGetApp().model().objects[volume->object_idx()]->raw_mesh_bounding_box().size());
-			m_new_scale    = volume->get_instance_scaling_factor() * 100.;
+            m_new_size = volume->get_instance_scaling_factor().cwiseProduct(wxGetApp().model().objects[volume->object_idx()]->raw_mesh_bounding_box().size());
+            m_new_scale    = volume->get_instance_scaling_factor() * 100.;
 		}
 
         m_new_enabled  = true;
@@ -569,7 +569,7 @@ void ObjectManipulation::update_settings_value(const Selection& selection)
         m_new_position = volume->get_volume_offset();
         m_new_rotation = volume->get_volume_rotation() * (180. / M_PI);
         m_new_scale    = volume->get_volume_scaling_factor() * 100.;
-        m_new_size     = volume->get_instance_transformation().get_scaling_factor().cwiseProduct(volume->get_volume_transformation().get_scaling_factor().cwiseProduct(volume->bounding_box().size()));
+        m_new_size = volume->get_instance_scaling_factor().cwiseProduct(volume->get_volume_scaling_factor().cwiseProduct(volume->bounding_box().size()));
         m_new_enabled = true;
     }
     else if (obj_list->multiple_selection() || obj_list->is_selected(itInstanceRoot)) {
@@ -861,7 +861,7 @@ void ObjectManipulation::change_scale_value(int axis, double value)
     Vec3d scale = m_cache.scale;
 	scale(axis) = value;
 
-    this->do_scale(axis, scale);
+    this->do_scale(axis, 0.01 * scale);
 
     m_cache.scale = scale;
 	m_cache.scale_rounded(axis) = DBL_MAX;
@@ -880,14 +880,21 @@ void ObjectManipulation::change_size_value(int axis, double value)
     const Selection& selection = wxGetApp().plater()->canvas3D()->get_selection();
 
     Vec3d ref_size = m_cache.size;
-	if (selection.is_single_volume() || selection.is_single_modifier())
-        ref_size = selection.get_volume(*selection.get_volume_idxs().begin())->bounding_box().size();
+    if (selection.is_single_volume() || selection.is_single_modifier()) {
+        const GLVolume* v = selection.get_volume(*selection.get_volume_idxs().begin());
+        const Vec3d local_size = size.cwiseQuotient(v->get_instance_scaling_factor());
+        const Vec3d local_ref_size = v->bounding_box().size().cwiseProduct(v->get_volume_scaling_factor());
+        const Vec3d local_change = local_size.cwiseQuotient(local_ref_size);
+
+        size = local_change.cwiseProduct(v->get_volume_scaling_factor());
+        ref_size = Vec3d::Ones();
+    }
     else if (selection.is_single_full_instance())
 		ref_size = m_world_coordinates ? 
             selection.get_unscaled_instance_bounding_box().size() :
             wxGetApp().model().objects[selection.get_volume(*selection.get_volume_idxs().begin())->object_idx()]->raw_mesh_bounding_box().size();
 
-    this->do_scale(axis, 100. * Vec3d(size(0) / ref_size(0), size(1) / ref_size(1), size(2) / ref_size(2)));
+    this->do_scale(axis, size.cwiseQuotient(ref_size));
 
     m_cache.size = size;
 	m_cache.size_rounded(axis) = DBL_MAX;
@@ -910,7 +917,7 @@ void ObjectManipulation::do_scale(int axis, const Vec3d &scale) const
         scaling_factor = scale(axis) * Vec3d::Ones();
 
     selection.start_dragging();
-    selection.scale(scaling_factor * 0.01, transformation_type);
+    selection.scale(scaling_factor, transformation_type);
     wxGetApp().plater()->canvas3D()->do_scale(L("Set Scale"));
 }