mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 08:47:52 -06:00
Fixed conflicts after merge with master
This commit is contained in:
commit
3e902ecfbd
20 changed files with 445 additions and 114 deletions
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue