From badab39ef1739ae5de05b8da1b1607df60f83798 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 28 May 2013 15:58:57 -0700 Subject: [PATCH] resolve conflict on merge with upstream master --- interface/src/Avatar.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Avatar.cpp b/interface/src/Avatar.cpp index 621203d7b2..3981d4f76d 100644 --- a/interface/src/Avatar.cpp +++ b/interface/src/Avatar.cpp @@ -434,7 +434,7 @@ void Avatar::simulate(float deltaTime, Transmitter* transmitter) { _head.setBodyRotation (glm::vec3(_bodyPitch, _bodyYaw, _bodyRoll)); _head.setPosition(_joint[ AVATAR_JOINT_HEAD_BASE ].springyPosition); _head.setScale (_joint[ AVATAR_JOINT_HEAD_BASE ].radius); - _head.setSkinColor(glm::vec3(skinColor[0], skinColor[1], skinColor[2])); + _head.setSkinColor(glm::vec3(SKIN_COLOR[0], SKIN_COLOR[1], SKIN_COLOR[2])); _head.simulate(deltaTime, !_owningAgent); // use speed and angular velocity to determine walking vs. standing