From 4142d8c6862ff06949cf2590326d8571be8493bf Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 21 May 2017 11:05:18 -0700
Subject: [PATCH] actions shouldn't change locked entities

---
 libraries/physics/src/ObjectAction.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/physics/src/ObjectAction.cpp b/libraries/physics/src/ObjectAction.cpp
index de14a46be4..87732ded03 100644
--- a/libraries/physics/src/ObjectAction.cpp
+++ b/libraries/physics/src/ObjectAction.cpp
@@ -58,6 +58,10 @@ void ObjectAction::updateAction(btCollisionWorld* collisionWorld, btScalar delta
         return;
     }
 
+    if (ownerEntity->getLocked()) {
+        return;
+    }
+
     updateActionWorker(deltaTimeStep);
 }