From 63c19f7c111ae36b74be771929dfc2a85b206806 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 27 May 2015 20:19:59 -0700
Subject: [PATCH] fix build buster from bad merge

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

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index bbf8879a5d..b4941b833b 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -333,8 +333,8 @@ 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 savePosition = getPosition();
+    glm::quat saveRotation = getRotation();
     glm::vec3 saveVelocity = _velocity;
     glm::vec3 saveAngularVelocity = _angularVelocity;
 
@@ -625,8 +625,8 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     if (overwriteLocalData && _simulatorID == myNodeID && !_simulatorID.isNull()) {
         // we own the simulation, so we keep our transform+velocities and remove any related dirty flags
         // rather than accept the values in the packet
-        _position = savePosition;
-        _rotation = saveRotation;
+        setPosition(savePosition);
+        setRotation(saveRotation);
         _velocity = saveVelocity;
         _angularVelocity = saveAngularVelocity;
         _dirtyFlags &= ~(EntityItem::DIRTY_TRANSFORM | EntityItem::DIRTY_VELOCITIES);