History

Merge branch 'master' into NOverlays3

Sam Gondelman committed 7 years ago

Commit d30dd4c2 parents 645508d 43f84a9175 files · +2703 −1611Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+4−0
@@ -486,6 +486,8 @@ QUuid EntityScriptingInterface::addEntity(const EntityItemProperties& properties · 485 unmodified lines
486486
487487 propertiesWithSimID.setLastEditedBy(sessionID);
488488
489+ propertiesWithSimID.setActionData(QByteArray());
490+
489491 bool scalesWithParent = propertiesWithSimID.getScalesWithParent();
490492
491493 propertiesWithSimID = convertPropertiesFromScriptSemantics(propertiesWithSimID, scalesWithParent);
@@ -834,6 +836,8 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 342 unmodified lines
834836 properties.setClientOnly(entity->getClientOnly());
835837 properties.setOwningAvatarID(entity->getOwningAvatarID());
836838
839+ properties.setActionData(entity->getDynamicData());
840+
837841 // make sure the properties has a type, so that the encode can know which properties to include
838842 properties.setType(entity->getType());
839843