Merge pull request #888 from ey6es/master

Render the ball heads with the voxeltar bodies.
This commit is contained in:
Andrzej Kapolka 2013-08-23 14:23:51 -07:00
commit 9eb05d13de
2 changed files with 4 additions and 2 deletions

View file

@ -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);

View file

@ -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);