From 71768ef27573bba0a6d0740ece7d4f20dccfb7be Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 5 Mar 2015 12:36:45 -0800
Subject: [PATCH] Return entity IDs on paste

---
 interface/src/Application.cpp                           | 4 ++--
 interface/src/Application.h                             | 2 +-
 interface/src/scripting/ClipboardScriptingInterface.cpp | 4 ++--
 interface/src/scripting/ClipboardScriptingInterface.h   | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 6484e364bc..6f5239a6b2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1683,8 +1683,8 @@ bool Application::importEntities(const QString& filename) {
     return success;
 }
 
-void Application::pasteEntities(float x, float y, float z) {
-    _entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z);
+QVector<EntityItemID> Application::pasteEntities(float x, float y, float z) {
+    return _entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z);
 }
 
 void Application::initDisplay() {
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 9c32f32b8f..e027f85538 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -323,7 +323,7 @@ public slots:
     void nodeKilled(SharedNodePointer node);
     void packetSent(quint64 length);
 
-    void pasteEntities(float x, float y, float z);
+    QVector<EntityItemID> pasteEntities(float x, float y, float z);
     bool exportEntities(const QString& filename, const QStringList& entityIDs);
     bool exportEntities(const QString& filename, float x, float y, float z, float scale);
     bool importEntities(const QString& filename);
diff --git a/interface/src/scripting/ClipboardScriptingInterface.cpp b/interface/src/scripting/ClipboardScriptingInterface.cpp
index 6002661011..a06a0500f3 100644
--- a/interface/src/scripting/ClipboardScriptingInterface.cpp
+++ b/interface/src/scripting/ClipboardScriptingInterface.cpp
@@ -26,6 +26,6 @@ bool ClipboardScriptingInterface::importEntities(const QString& filename) {
     return Application::getInstance()->importEntities(filename);
 }
 
-void ClipboardScriptingInterface::pasteEntities(float x, float y, float z, float s) {
-    Application::getInstance()->pasteEntities(x, y, z);
+QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(float x, float y, float z, float s) {
+    return Application::getInstance()->pasteEntities(x, y, z);
 }
diff --git a/interface/src/scripting/ClipboardScriptingInterface.h b/interface/src/scripting/ClipboardScriptingInterface.h
index bc270210dc..bb993c32a4 100644
--- a/interface/src/scripting/ClipboardScriptingInterface.h
+++ b/interface/src/scripting/ClipboardScriptingInterface.h
@@ -23,8 +23,9 @@ signals:
     
 public slots:
     bool importEntities(const QString& filename);
+    bool exportEntities(const QString& filename, QStringList entityIDs);
     bool exportEntities(const QString& filename, float x, float y, float z, float s);
-    void pasteEntities(float x, float y, float z, float s);
+    QVector<EntityItemID> pasteEntities(float x, float y, float z, float s);
 };
 
 #endif // hifi_ClipboardScriptingInterface_h