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

src/slic3r/GUI/GLCanvas3D.cpp

@@ -4994,6 +4994,7 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
             post_event(SimpleEvent(EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED));
 #if ENABLE_CONSTRAINED_CAMERA_TARGET
             m_camera.set_scene_box(scene_bounding_box(), *this);
+            set_camera_zoom(0.0f);
 #endif // ENABLE_CONSTRAINED_CAMERA_TARGET
         }
 

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -1152,13 +1152,19 @@ void ObjectList::add_object_to_list(size_t obj_idx)
 
     // add volumes to the object
     if (model_object->volumes.size() > 1) {
-        for (auto id = 0; id < model_object->volumes.size(); id++)
-            m_objects_model->AddVolumeChild(item,
-            model_object->volumes[id]->name,
-            ModelVolume::MODEL_PART,
-            !model_object->volumes[id]->config.has("extruder") ? 0 :
+        for (auto id = 0; id < model_object->volumes.size(); id++) {
+            auto vol_item = m_objects_model->AddVolumeChild(item,
+                model_object->volumes[id]->name,
+                model_object->volumes[id]->type()/*ModelVolume::MODEL_PART*/,
+                !model_object->volumes[id]->config.has("extruder") ? 0 :
                 model_object->volumes[id]->config.option<ConfigOptionInt>("extruder")->value,
-            false);
+                false);
+            auto opt_keys = model_object->volumes[id]->config.keys();
+            if (!opt_keys.empty() && !(opt_keys.size() == 1 && opt_keys[0] == "extruder")) {
+                select_item(m_objects_model->AddSettingsChild(vol_item));
+                Collapse(vol_item);
+            }
+        }
         Expand(item);
     }
 
@@ -1532,7 +1538,24 @@ void ObjectList::change_part_type()
     ModelVolume* volume = get_selected_model_volume();
     if (!volume)
         return;
+
     const auto type = volume->type();
+    if (type == ModelVolume::MODEL_PART)
+    {
+        const int obj_idx = get_selected_obj_idx();
+        if (obj_idx < 0) return;
+
+        int model_part_cnt = 0;
+        for (auto vol : (*m_objects)[obj_idx]->volumes) {
+            if (vol->type() == ModelVolume::MODEL_PART)
+                ++model_part_cnt;
+        }
+
+        if (model_part_cnt == 1) {
+            Slic3r::GUI::show_error(nullptr, _(L("You can't change a type of the last solid part of the object.")));
+            return;
+        }
+    }
 
     const wxString names[] = { "Part", "Modifier", "Support Enforcer", "Support Blocker" };
     
@@ -1552,11 +1575,11 @@ void ObjectList::change_part_type()
     //(we show additional settings for Part and Modifier and hide it for Support Blocker/Enforcer)
     const auto settings_item = m_objects_model->GetSettingsItem(item);
     if (settings_item && 
-        new_type == ModelVolume::SUPPORT_ENFORCER || new_type == ModelVolume::SUPPORT_BLOCKER) {
+        (new_type == ModelVolume::SUPPORT_ENFORCER || new_type == ModelVolume::SUPPORT_BLOCKER)) {
         m_objects_model->Delete(settings_item);
     }
     else if (!settings_item && 
-              new_type == ModelVolume::MODEL_PART || new_type == ModelVolume::PARAMETER_MODIFIER) {
+              (new_type == ModelVolume::MODEL_PART || new_type == ModelVolume::PARAMETER_MODIFIER)) {
         select_item(m_objects_model->AddSettingsChild(item));
     }
 }

src/slic3r/GUI/MainFrame.cpp

@@ -795,6 +795,7 @@ void MainFrame::update_ui_from_settings()
     bool bp_on = wxGetApp().app_config->get("background_processing") == "1";
     m_menu_item_reslice_now->Enable(bp_on);
     m_plater->sidebar().show_button(baReslice, !bp_on);
+    m_plater->sidebar().Layout();
     if (m_plater)
         m_plater->update_ui_from_settings();
     for (auto tab: wxGetApp().tabs_list)