History

bring over code from entity-level-locking branch

Seth Alves committed 11 years ago

Commit 2dc49221 parent 5312bee10 files · +245 −122Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+1−1
@@ -574,7 +574,7 @@ QUuid EntityScriptingInterface::addAction(const QString& actionTypeString, · 573 unmodified lines
574574 if (actionType == ACTION_TYPE_NONE) {
575575 return false;
576576 }
577− EntityActionPointer action = actionFactory->factory(simulation, actionType, actionID, entity, arguments);
577+ EntityActionPointer action = actionFactory->factory(actionType, actionID, entity, arguments);
578578 if (action) {
579579 entity->addAction(simulation, action);
580580 auto nodeList = DependencyManager::get<NodeList>();