From 487131dde1d55634065de7a0dfbf5838a1e28efe Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Thu, 15 Oct 2015 14:52:38 -0700 Subject: [PATCH] cleanups --- interface/src/avatar/Avatar.h | 2 -- interface/src/avatar/AvatarActionHold.cpp | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/interface/src/avatar/Avatar.h b/interface/src/avatar/Avatar.h index 1ad4411619..9a46a145c2 100644 --- a/interface/src/avatar/Avatar.h +++ b/interface/src/avatar/Avatar.h @@ -174,8 +174,6 @@ public: void setMotionState(AvatarMotionState* motionState) { _motionState = motionState; } AvatarMotionState* getMotionState() { return _motionState; } - virtual RigPointer getRig() const { return _skeletonModel.getRig(); } - public slots: glm::vec3 getLeftPalmPosition(); glm::vec3 getLeftPalmVelocity(); diff --git a/interface/src/avatar/AvatarActionHold.cpp b/interface/src/avatar/AvatarActionHold.cpp index 018108ac52..561a2bbcc5 100644 --- a/interface/src/avatar/AvatarActionHold.cpp +++ b/interface/src/avatar/AvatarActionHold.cpp @@ -121,11 +121,11 @@ bool AvatarActionHold::updateArguments(QVariantMap arguments) { holderID = myAvatar->getSessionUUID(); if (somethingChanged || - relativePosition != _relativePosition - || relativeRotation != _relativeRotation - || timeScale != _linearTimeScale - || hand != _hand - || holderID != _holderID) { + relativePosition != _relativePosition || + relativeRotation != _relativeRotation || + timeScale != _linearTimeScale || + hand != _hand || + holderID != _holderID) { needUpdate = true; } });