History

fix merge conflict

Dante Ruiz committed 8 years ago

Commit 07b04311 parent 7ea404231 files · +607 −252Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 31 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+5−0
@@ -101,6 +101,11 @@ bool EntityScriptingInterface::canWriteAssets() { · 100 unmodified lines
101 return nodeList->getThisNodeCanWriteAssets();101 return nodeList->getThisNodeCanWriteAssets();
102}102}
103 103
104bool EntityScriptingInterface::canReplaceContent() {
105 auto nodeList = DependencyManager::get<NodeList>();
106 return nodeList->getThisNodeCanReplaceContent();
107}
108
104void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {109void EntityScriptingInterface::setEntityTree(EntityTreePointer elementTree) {
105 if (_entityTree) {110 if (_entityTree) {
106 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);111 disconnect(_entityTree.get(), &EntityTree::addingEntity, this, &EntityScriptingInterface::addingEntity);