History

rename properties, add clone avatar entity, remove worldEntityProps arg, fix clone ID cleanup on delete

David Back committed 8 years ago

Commit f74e2191 parent 623410a14 files · +192 −114Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+2−1
@@ -333,7 +333,8 @@ QUuid EntityScriptingInterface::cloneEntity(QUuid entityIDToClone) { · 332 unmodified lines
333 EntityItemID newEntityID;333 EntityItemID newEntityID;
334 EntityItemProperties properties = getEntityProperties(entityIDToClone);334 EntityItemProperties properties = getEntityProperties(entityIDToClone);
335 properties.convertToCloneProperties(entityIDToClone);335 properties.convertToCloneProperties(entityIDToClone);
336 if (addLocalEntityCopy(properties, newEntityID)) {336 bool success = addLocalEntityCopy(properties, newEntityID);
337 if (success) {
337 getEntityPacketSender()->queueCloneEntityMessage(entityIDToClone, newEntityID);338 getEntityPacketSender()->queueCloneEntityMessage(entityIDToClone, newEntityID);
338 return newEntityID;339 return newEntityID;
339 } else {340 } else {