From 3825830fac860f157193932463ace3a9e47616e1 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Mon, 22 May 2017 14:07:53 -0700
Subject: [PATCH] if something is locked but in motion, make it kinematic
 rather than static

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

diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 452495cf18..fdd290bfca 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -186,6 +186,9 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
     }
 
     if (_entity->getLocked()) {
+        if (_entity->isMoving()) {
+            return MOTION_TYPE_KINEMATIC;
+        }
         return MOTION_TYPE_STATIC;
     }