From b5bfbba7595b30e5d6a35a44af6b1401031f3716 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 14 Apr 2015 10:17:54 -0700 Subject: [PATCH] only set simulationID on scripted entity creation if the entity has velocity or rotation --- libraries/entities/src/EntityScriptingInterface.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index d0c3457a5c..06c5493720 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -68,10 +68,13 @@ EntityItemID EntityScriptingInterface::addEntity(const EntityItemProperties& pro // This Node is creating a new object. If it's in motion, set this Node as the simulator. auto nodeList = DependencyManager::get(); const QString myNodeID = nodeList->getSessionUUID().toString(); - // QString simulatorID = _entity->getSimulatorID(); EntityItemProperties propertiesWithSimID = properties; - propertiesWithSimID.setSimulatorID(myNodeID); + + // if this object is moving, set this Node as the simulation owner + if (properties.velocityChanged() || properties.rotationChanged()) { + propertiesWithSimID.setSimulatorID(myNodeID); + } EntityItemID id(NEW_ENTITY, creatorTokenID, false );