From 3e71efcdbbe63c0b4cb099f8bf0f7c996b9bcff7 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth@highfidelity.io>
Date: Wed, 10 Feb 2016 18:21:44 -0800
Subject: [PATCH] all code that asks isMoving appears to mean relative to
 parent

---
 libraries/entities/src/EntityItem.cpp       | 4 ----
 libraries/entities/src/EntityItem.h         | 1 -
 libraries/entities/src/EntitySimulation.cpp | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index f496eaced4..7c5ba72096 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -993,10 +993,6 @@ void EntityItem::simulateKinematicMotion(float timeElapsed, bool setFlags) {
 }
 
 bool EntityItem::isMoving() const {
-    return hasVelocity() || hasAngularVelocity();
-}
-
-bool EntityItem::isMovingRelativeToParent() const {
     return hasLocalVelocity() || hasLocalAngularVelocity();
 }
 
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 55741823f1..a1e5257d29 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -345,7 +345,6 @@ public:
     void clearDirtyFlags(uint32_t mask = 0xffffffff) { _dirtyFlags &= ~mask; }
 
     bool isMoving() const;
-    bool isMovingRelativeToParent() const;
 
     bool isSimulated() const { return _simulated; }
 
diff --git a/libraries/entities/src/EntitySimulation.cpp b/libraries/entities/src/EntitySimulation.cpp
index a1f55a92a3..23e5b99337 100644
--- a/libraries/entities/src/EntitySimulation.cpp
+++ b/libraries/entities/src/EntitySimulation.cpp
@@ -254,7 +254,7 @@ void EntitySimulation::moveSimpleKinematics(const quint64& now) {
     SetOfEntities::iterator itemItr = _simpleKinematicEntities.begin();
     while (itemItr != _simpleKinematicEntities.end()) {
         EntityItemPointer entity = *itemItr;
-        if (entity->isMovingRelativeToParent() && !entity->getPhysicsInfo()) {
+        if (entity->isMoving() && !entity->getPhysicsInfo()) {
             entity->simulate(now);
             _entitiesToSort.insert(entity);
             ++itemItr;