From a9ff483d3d03f6db08827dbe73a502602aa3309b Mon Sep 17 00:00:00 2001 From: Jeffrey Ventrella Date: Wed, 24 Apr 2013 15:35:11 -0700 Subject: [PATCH] fix --- interface/src/Head.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 94e36c5673..1e6e78fef2 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -349,7 +349,7 @@ void Head::simulate(float deltaTime) { //--------------------------------------------------------------------- // if I am holding hands with another avatar, a force is applied //--------------------------------------------------------------------- - if (( getHandState() == 1 ) + if (( _handState == 1 ) || ( _interactingOther->_handState == 1 )) { glm::vec3 vectorToOtherHand = _interactingOther->_handPosition - _handHolding.position; glm::vec3 vectorToMyHand = _bone[ AVATAR_BONE_RIGHT_HAND ].position - _handHolding.position; @@ -1148,7 +1148,6 @@ void Head::updateHandMovement( float deltaTime ) { _bone[ AVATAR_BONE_RIGHT_HAND ].position += transformedHandMovement; if (_isMine) { - //setHandState(_mousePressed); _handState = _mousePressed; } }