Add ability to paste entities to any host type
Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -4070,7 +4070,7 @@ std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl dom · 4069 unmodified lines | |||
| 4070 | bool success = tmpTree->readFromByteArray(domainURL.toString(), data); | 4070 | bool success = tmpTree->readFromByteArray(domainURL.toString(), data); |
| 4071 | if (success) { | 4071 | if (success) { |
| 4072 | tmpTree->reaverageOctreeElements(); | 4072 | tmpTree->reaverageOctreeElements(); |
| 4073 | tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), 0, 0, 0); | 4073 | tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), "domain", 0, 0, 0); |
| 4074 | } | 4074 | } |
| 4075 | std::map<QString, QString> namedPaths = tmpTree->getNamedPaths(); | 4075 | std::map<QString, QString> namedPaths = tmpTree->getNamedPaths(); |
| 4076 | 4076 | ||
| @@ -5550,8 +5550,8 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse · 1473 unmodified lines | |||
| 5550 | return success; | 5550 | return success; |
| 5551 | } | 5551 | } |
| 5552 | 5552 | ||
| 5553 | QVector<EntityItemID> Application::pasteEntities(float x, float y, float z) { | 5553 | QVector<EntityItemID> Application::pasteEntities(const QString& entityHostType, float x, float y, float z) { |
| 5554 | return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), x, y, z); | 5554 | return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), entityHostType, x, y, z); |
| 5555 | } | 5555 | } |
| 5556 | 5556 | ||
| 5557 | void Application::init() { | 5557 | void Application::init() { |