Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -4065,7 +4065,7 @@ std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl dom · 4064 unmodified lines | |||
| 4065 | bool success = tmpTree->readFromByteArray(domainURL.toString(), data); | 4065 | bool success = tmpTree->readFromByteArray(domainURL.toString(), data); |
| 4066 | if (success) { | 4066 | if (success) { |
| 4067 | tmpTree->reaverageOctreeElements(); | 4067 | tmpTree->reaverageOctreeElements(); |
| 4068 | tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), 0, 0, 0); | 4068 | tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), nullptr, 0, 0, 0); |
| 4069 | } | 4069 | } |
| 4070 | std::map<QString, QString> namedPaths = tmpTree->getNamedPaths(); | 4070 | std::map<QString, QString> namedPaths = tmpTree->getNamedPaths(); |
| 4071 | 4071 | ||
| @@ -5545,8 +5545,8 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse · 1473 unmodified lines | |||
| 5545 | return success; | 5545 | return success; |
| 5546 | } | 5546 | } |
| 5547 | 5547 | ||
| 5548 | QVector<EntityItemID> Application::pasteEntities(float x, float y, float z) { | 5548 | QVector<EntityItemID> Application::pasteEntities(QString entityHostType, float x, float y, float z) { |
| 5549 | return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), x, y, z); | 5549 | return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), entityHostType, x, y, z); |
| 5550 | } | 5550 | } |
| 5551 | 5551 | ||
| 5552 | void Application::init() { | 5552 | void Application::init() { |