From 28ffd8eca78113261cf0a04b60506216f64f4e92 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 23 Aug 2013 14:22:00 -0700 Subject: [PATCH] Render the ball heads with the voxeltar bodies. --- interface/src/avatar/Avatar.cpp | 3 ++- interface/src/avatar/MyAvatar.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp index 4635be7357..1b9cc71b7f 100755 --- a/interface/src/avatar/Avatar.cpp +++ b/interface/src/avatar/Avatar.cpp @@ -763,10 +763,11 @@ void Avatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) { } } } else { - // Render the body's voxels + // Render the body's voxels and head float alpha = getBallRenderAlpha(BODY_BALL_HEAD_BASE, lookingInMirror); if (alpha > 0.0f) { _voxels.render(false); + _head.render(alpha); } } _hand.render(lookingInMirror); diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 175b38378d..0a811e2d48 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -595,10 +595,11 @@ void MyAvatar::renderBody(bool lookingInMirror, bool renderAvatarBalls) { } } } else { - // Render the body's voxels + // Render the body's voxels and head float alpha = getBallRenderAlpha(BODY_BALL_HEAD_BASE, lookingInMirror); if (alpha > 0.0f) { _voxels.render(false); + _head.render(alpha); } } _hand.render(lookingInMirror);