Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -1631,19 +1631,15 @@ void Application::importVoxels() { · 1630 unmodified lines | |||
| 1631 | } | 1631 | } |
| 1632 | 1632 | ||
| 1633 | bool Application::importEntities(const QString& filename) { | 1633 | bool Application::importEntities(const QString& filename) { |
| 1634 | qDebug() << "Application::importEntities()..."; | ||
| 1635 | _entityClipboard.eraseAllOctreeElements(); | 1634 | _entityClipboard.eraseAllOctreeElements(); |
| 1636 | bool success = _entityClipboard.readFromSVOFile(filename.toLocal8Bit().constData()); | 1635 | bool success = _entityClipboard.readFromSVOFile(filename.toLocal8Bit().constData()); |
| 1637 | qDebug() << " success=" << success; | ||
| 1638 | if (success) { | 1636 | if (success) { |
| 1639 | _entityClipboard.dumpTree(); | ||
| 1640 | _entityClipboard.reaverageOctreeElements(); | 1637 | _entityClipboard.reaverageOctreeElements(); |
| 1641 | } | 1638 | } |
| 1642 | return success; | 1639 | return success; |
| 1643 | } | 1640 | } |
| 1644 | 1641 | ||
| 1645 | void Application::pasteEntities(float x, float y, float z) { | 1642 | void Application::pasteEntities(float x, float y, float z) { |
| 1646 | qDebug() << "Application::pasteEntities(" << x << ", " << y << ", " << z << ")"; | ||
| 1647 | _entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z); | 1643 | _entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z); |
| 1648 | } | 1644 | } |
| 1649 | 1645 | ||