From cfbe8a719c3b38873b7a4e3bce33dc547a032b49 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 24 Apr 2013 12:39:25 -0700 Subject: [PATCH] fix getter for hand state in AvatarData --- interface/src/Head.cpp | 2 +- libraries/avatars/src/AvatarData.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/Head.cpp b/interface/src/Head.cpp index 9770bcbce1..ac6e412b1e 100644 --- a/interface/src/Head.cpp +++ b/interface/src/Head.cpp @@ -1263,7 +1263,7 @@ void Head::renderBody() { //--------------------------------------------------------- // if the hand is grasping, show it... //--------------------------------------------------------- - if (( _usingBodySprings ) && ( getHandState() == 1 )) { + if (( _usingBodySprings ) && ( _handState == 1 )) { glPushMatrix(); glTranslatef ( diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index c403a1683a..e404efaf84 100644 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -48,7 +48,7 @@ public: // Hand State void setHandState(char s) { _handState = s; }; - const float getHandState() const {return _handState; }; //@Philip - shouldn't this be an int or a char? + const char getHandState() const {return _handState; }; // Instantaneous audio loudness to drive mouth/facial animation void setLoudness(float l) { _audioLoudness = l; };