Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer

src/libslic3r/Format/3mf.cpp

@@ -567,7 +567,7 @@ namespace Slic3r {
                     {
                         // ensure the zip archive is closed and rethrow the exception
                         close_zip_reader(&archive);
-                        throw e;
+                        throw std::runtime_error(e.what());
                     }
                 }
             }

src/libslic3r/Format/AMF.cpp

@@ -872,7 +872,7 @@ bool load_amf_archive(const char* path, DynamicPrintConfig* config, Model* model
                 {
                     // ensure the zip archive is closed and rethrow the exception
                     close_zip_reader(&archive);
-                    throw e;
+                    throw std::runtime_error(e.what());
                 }
 
                 break;

src/slic3r/GUI/PresetBundle.cpp

@@ -1532,7 +1532,9 @@ void PresetBundle::update_platter_filament_ui(unsigned int idx_extruder, GUI::Pr
             }
             // Paint a lock at the system presets.
             bmps.emplace_back(m_bitmapCache->mkclear(space_icon_width, icon_height));
-            bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmapLock : m_bitmapCache->mkclear(normal_icon_width, icon_height));
+            // To avoid asserts, each added bitmap to wxBitmapCombobox should be the same size, so
+            // for nonsystem presets set a width of empty bitmap to m_bitmapLock->GetWidth()
+            bmps.emplace_back((preset.is_system || preset.is_default) ? *m_bitmapLock : m_bitmapCache->mkclear(m_bitmapLock->GetWidth(), icon_height));
 //                 (preset.is_dirty ? *m_bitmapLockOpen : *m_bitmapLock) : m_bitmapCache->mkclear(16, 16));
             bitmap = m_bitmapCache->insert(bitmap_key, bmps);
 		}

src/slic3r/GUI/wxExtensions.cpp

@@ -786,7 +786,12 @@ wxDataViewItem ObjectDataViewModel::AddInstanceRoot(const wxDataViewItem &parent
 
 wxDataViewItem ObjectDataViewModel::AddInstanceChild(const wxDataViewItem &parent_item, size_t num)
 {
-    const std::vector<bool> print_indicator(num, true);
+    std::vector<bool> print_indicator(num, true);
+
+    // if InstanceRoot item isn't created for this moment
+    if (!GetInstanceRootItem(parent_item).IsOk())
+        // use object's printable state to first instance
+        print_indicator[0] = IsPrintable(parent_item);
     
     return wxDataViewItem((void*)AddInstanceChild(parent_item, print_indicator));
 }
@@ -799,21 +804,12 @@ wxDataViewItem ObjectDataViewModel::AddInstanceChild(const wxDataViewItem& paren
 
     ObjectDataViewModelNode* inst_root_node = (ObjectDataViewModelNode*)inst_root_item.GetID();
 
-    const bool just_created = inst_root_node->GetChildren().Count() == 0;
-
     // Add instance nodes
     ObjectDataViewModelNode *instance_node = nullptr;    
     size_t counter = 0;
     while (counter < print_indicator.size()) {
         instance_node = new ObjectDataViewModelNode(inst_root_node, itInstance);
 
-//        // if InstanceRoot item is just created and start to adding Instances
-//        if (just_created && counter == 0) {
-//            ObjectDataViewModelNode* obj_node = (ObjectDataViewModelNode*)parent_item.GetID();
-//            // use object's printable state to first instance
-//            instance_node->set_printable_icon(obj_node->IsPrintable());
-//        }
-//        else
         instance_node->set_printable_icon(print_indicator[counter] ? piPrintable : piUnprintable);
 
         inst_root_node->Append(instance_node);