juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
Enrico Turri
2019-04-12 08:41:59 +02:00
parent a8fd1ceca0 59758fea55
commit 3e902ecfbd
20 changed files with 445 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/Plater.cpp
View File

@@ -3711,6 +3711,7 @@ void Plater::paste_from_clipboard()
{
p->view3D->get_canvas3d()->get_selection().paste_from_clipboard();
}
bool Plater::can_paste_from_clipboard() const
{
const Selection& selection = p->view3D->get_canvas3d()->get_selection();