From fbaa86426c1359966f6308589c0f9ff91c8cf9e1 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 3 Nov 2015 16:52:46 -0800
Subject: [PATCH] re-remove the _nextPosition stuff

---
 interface/src/avatar/AvatarUpdate.cpp |  1 -
 libraries/avatars/src/AvatarData.cpp  | 13 -------------
 libraries/avatars/src/AvatarData.h    |  4 ----
 3 files changed, 18 deletions(-)

diff --git a/interface/src/avatar/AvatarUpdate.cpp b/interface/src/avatar/AvatarUpdate.cpp
index cae593ff85..acdb251950 100644
--- a/interface/src/avatar/AvatarUpdate.cpp
+++ b/interface/src/avatar/AvatarUpdate.cpp
@@ -62,7 +62,6 @@ bool AvatarUpdate::process() {
     manager->updateMyAvatar(deltaSeconds);
     myAvatar->endUpdate();
 
-
     if (!isThreaded()) {
         return true;
     }
diff --git a/libraries/avatars/src/AvatarData.cpp b/libraries/avatars/src/AvatarData.cpp
index a06b3448ea..63e20b55b5 100644
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@@ -128,10 +128,6 @@ void AvatarData::nextAttitude(glm::vec3 position, glm::quat orientation) {
 }
 void AvatarData::startCapture() {
     avatarLock.lock();
-    assert(_nextAllowed);
-    _nextAllowed = false;
-    _nextPosition = getPosition();
-    _nextOrientation = getOrientation();
 }
 void AvatarData::endCapture() {
     avatarLock.unlock();
@@ -151,19 +147,10 @@ void AvatarData::endRenderRun() {
     avatarLock.unlock();
 }
 void AvatarData::startRender() {
-    glm::vec3 pos = getPosition();
-    glm::quat rot = getOrientation();
-    setPosition(_nextPosition);
-    setOrientation(_nextOrientation);
     updateAttitude();
-    _nextPosition = pos;
-    _nextOrientation = rot;
 }
 void AvatarData::endRender() {
-    setPosition(_nextPosition);
-    setOrientation(_nextOrientation);
     updateAttitude();
-    _nextAllowed = true;
 }
 
 float AvatarData::getTargetScale() const {
diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h
index 2e3257554d..952017aa77 100644
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@@ -363,10 +363,6 @@ public slots:
 protected:
     glm::vec3 _handPosition;
 
-    glm::vec3 _nextPosition {};
-    glm::quat _nextOrientation {};
-    bool _nextAllowed {true};
-
     // Body scale
     float _targetScale;