Fixed conflicts after merge with master

This commit is contained in:
Enrico Turri 2019-04-12 08:41:59 +02:00
commit 3e902ecfbd
20 changed files with 445 additions and 114 deletions

View file

@ -1079,6 +1079,7 @@ void Selection::paste_from_clipboard()
case Instance:
{
paste_objects_from_clipboard();
break;
}
}