From 872a00d518d8cc1636cd857f824343cad4c870dd Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 21 Jan 2016 15:53:47 -0800
Subject: [PATCH] entities that are children shouldn't (at this point) be
 dynamic.

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

diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 4e5f942265..9982b4d107 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -144,7 +144,12 @@ PhysicsMotionType EntityMotionState::computePhysicsMotionType() const {
         return MOTION_TYPE_STATIC;
     }
     assert(entityTreeIsLocked());
+
     if (_entity->getDynamic()) {
+        if (!_entity->getParentID().isNull()) {
+            // if something would have been dynamic but is a child of something else, force it to be kinematic, instead.
+            return MOTION_TYPE_KINEMATIC;
+        }
         return MOTION_TYPE_DYNAMIC;
     }
     return (_entity->isMoving() || _entity->hasActions()) ?  MOTION_TYPE_KINEMATIC : MOTION_TYPE_STATIC;