From 8efb07cfd8c81739615fce2665b3233b1552bf7e Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Tue, 19 Apr 2016 15:41:07 -0700
Subject: [PATCH] correctg measured acceleration for kinematics

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

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 4ea14a522d..673d5cf172 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -877,6 +877,10 @@ void EntityItem::simulate(const quint64& now) {
             // this entity is no longer moving
             // flag it to transition from KINEMATIC to STATIC
             _dirtyFlags |= Simulation::DIRTY_MOTION_TYPE;
+            setAcceleration(Vectors::ZERO);
+        } else {
+            // this object is moving kinematically, so make sure its "measured acceleration" is "gravity"
+            setAcceleration(_gravity);
         }
     }
     _lastSimulated = now;