Merge remote-tracking branch 'remotes/origin/master' into dev

src/slic3r/GUI/FirmwareDialog.cpp

@@ -866,7 +866,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 	SetSize(std::max(size.GetWidth(), static_cast<int>(p->min_width)), std::max(size.GetHeight(), static_cast<int>(p->min_height)));
 	Layout();
 
-    SetEscapeId(wxID_CLOSE); // To close the dialog using "Esc" button
+	SetEscapeId(wxID_CLOSE); // To close the dialog using "Esc" button
 
 	// Bind events
 
@@ -893,7 +893,6 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
 		this->p->fit_no_shrink();
 	});
 
-	p->btn_close->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->Close(); });
 	p->btn_rescan->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->p->find_serial_ports(); });
 
 	p->btn_flash->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) {

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -561,9 +561,9 @@ bool GLGizmosManager::on_mouse(wxMouseEvent& evt)
             gizmo_event(SLAGizmoEventType::LeftUp, mouse_pos, evt.ShiftDown(), evt.AltDown(), evt.ControlDown());
             processed = true;
         }
-        else if (evt.LeftUp() && (m_current == Flatten) && ((m_parent.get_first_hover_volume_idx() != -1) || grabber_contains_mouse()))
+        else if (evt.LeftUp() && (m_current == Flatten) && (m_gizmos[m_current]->get_hover_id() != -1))
         {
-            // to avoid to loose the selection when user clicks an object while the Flatten gizmo is active
+            // to avoid to loose the selection when user clicks an the white faces of a different object while the Flatten gizmo is active
             processed = true;
         }
     }

src/slic3r/GUI/Plater.cpp

@@ -2369,6 +2369,10 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
         {
             selection.add_object((unsigned int)idx, false);
         }
+
+        if (view3D->get_canvas3d()->get_gizmos_manager().is_running())
+            // this is required because the selected object changed and the flatten on face an sla support gizmos need to be updated accordingly
+            view3D->get_canvas3d()->update_gizmos_on_off_state();
     }
 
     return obj_idxs;