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

prusa3d · May 20, 2019 · 1ecb98e · 1ecb98e
2 parents f6de7a6 + 0132313
commit 1ecb98e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
@@ -380,7 +380,11 @@ void MainFrame::init_menubar()
         append_menu_item(fileMenu, wxID_ANY, _(L("&Save Project")) + "\tCtrl+S", _(L("Save current project file")),
             [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(into_path(m_plater->get_project_filename(".3mf"))); }, menu_icon("save"), nullptr,
             [this](){return m_plater != nullptr && can_save(); }, this);
+#ifdef __APPLE__
+        append_menu_item(fileMenu, wxID_ANY, _(L("Save Project &as")) + dots + "\tCtrl+Shift+S", _(L("Save current project file as")),
+#else
         append_menu_item(fileMenu, wxID_ANY, _(L("Save Project &as")) + dots + "\tCtrl+Alt+S", _(L("Save current project file as")),
+#endif // __APPLE__
             [this](wxCommandEvent&) { if (m_plater) m_plater->export_3mf(); }, menu_icon("save"), nullptr,
             [this](){return m_plater != nullptr && can_save(); }, this);
 

diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp
@@ -1863,7 +1863,12 @@ void Selection::paste_objects_from_clipboard()
     {
         ModelObject* dst_object = m_model->add_object(*src_object);
         double offset = wxGetApp().plater()->canvas3D()->get_size_proportional_to_max_bed_size(0.05);
-        dst_object->translate(offset, offset, 0.0);
+        Vec3d displacement(offset, offset, 0.0);
+        for (ModelInstance* inst : dst_object->instances)
+        {
+            inst->set_offset(inst->get_offset() + displacement);
+        }
+
         object_idxs.push_back(m_model->objects.size() - 1);
     }