diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index a82ba4f734..3ff59900f0 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3590,7 +3590,7 @@ void MixedFilamentConfigPanel::build_ui() if (m_mix_preview) { const std::string summary = summarize_sequence(preview_sequence); m_mix_preview->set_data(m_palette, preview_sequence, same_layer_mode, wxColour(m_mf.display_color), - _L("Preview"), summary.empty() ? wxEmptyString : from_u8(summary)); + _L("Preview"), summary.empty() ? wxString() : from_u8(summary)); } if (m_swatch) { m_swatch->SetBackgroundColour(wxColour(m_mf.display_color)); @@ -3788,7 +3788,7 @@ void MixedFilamentConfigPanel::update_preview() if (m_mix_preview) { const std::string summary = summarize_sequence(initial_sequence); m_mix_preview->set_data(m_palette, initial_sequence, same_layer_mode, wxColour(m_mf.display_color), - _L("Preview"), summary.empty() ? wxEmptyString : from_u8(summary)); + _L("Preview"), summary.empty() ? wxString() : from_u8(summary)); } } diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index c456dfa1a1..bd087d2d55 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -3158,7 +3158,7 @@ void Selection::paste_objects_from_clipboard() if (shift_all(0) != 0 || shift_all(1) != 0) { // BBS: if multiple objects are selected, move them as a whole after copy if (i == 0) empty_cell_all = wxGetApp().plater()->canvas3D()->get_nearest_empty_cell({start_point(0), start_point(1)}, {bbox.size()(0)+1,bbox.size()(1)+1}); - auto instance_shift = src_object->instances.front()->get_offset() - src_objects[0]->instances.front()->get_offset(); + Vec3d instance_shift = src_object->instances.front()->get_offset() - src_objects[0]->instances.front()->get_offset(); displacement = {shift_all.x() + empty_cell_all.x() + instance_shift.x(), shift_all.y() + empty_cell_all.y() + instance_shift.y(), start_offset(2)}; } else { // BBS: if only one object is copied, find an empty cell to put it