From ded79609de77de6024df6d3e2d58bd9537283d60 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 27 May 2015 15:10:27 -0700
Subject: [PATCH] back out unrelated change

---
 libraries/entities/src/EntityItem.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 275b22b4a7..d5a99bf263 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -321,11 +321,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     // if this bitstream indicates that this node is the simulation owner, ignore any physics-related updates.
     glm::vec3 savePosition = _position;
     glm::quat saveRotation = _rotation;
-    glm::vec3 saveVelocity = _velocity;
-    glm::vec3 saveAngularVelocity = _angularVelocity;
-    glm::vec3 saveGravity = _gravity;
-    glm::vec3 saveAcceleration = _acceleration;
-    uint32_t saveFlags = _dirtyFlags;
+    // glm::vec3 saveVelocity = _velocity;
+    // glm::vec3 saveAngularVelocity = _angularVelocity;
+    // glm::vec3 saveGravity = _gravity;
+    // glm::vec3 saveAcceleration = _acceleration;
 
 
     // Header bytes
@@ -627,15 +626,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         // this node, so our version has to be newer than what the packet contained.
         _position = savePosition;
         _rotation = saveRotation;
-        _velocity = saveVelocity;
-        _angularVelocity = saveAngularVelocity;
-        _gravity = saveGravity;
-        _acceleration = saveAcceleration;
-        _dirtyFlags &= ~(saveFlags & (EntityItem::DIRTY_POSITION |
-                                      EntityItem::DIRTY_ROTATION |
-                                      EntityItem::DIRTY_LINEAR_VELOCITY |
-                                      EntityItem::DIRTY_ANGULAR_VELOCITY |
-                                      EntityItem::DIRTY_PHYSICS_ACTIVATION));
+        // _velocity = saveVelocity;
+        // _angularVelocity = saveAngularVelocity;
+        // _gravity = saveGravity;
+        // _acceleration = saveAcceleration;
     }
 
     return bytesRead;