Merge pull request #3491 from ey6es/master

If we're rendering the billboard, don't render the body.
This commit is contained in:
Andrzej Kapolka 2014-09-26 13:48:57 -07:00
commit 2426df9e1d

View file

@ -505,10 +505,11 @@ void Avatar::renderBody(RenderMode renderMode, bool postLighting, float glowLeve
{ {
Glower glower(glowLevel); Glower glower(glowLevel);
if ((_shouldRenderBillboard || !(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) && if (_shouldRenderBillboard || !(_skeletonModel.isRenderable() && getHead()->getFaceModel().isRenderable())) {
(postLighting || renderMode == SHADOW_RENDER_MODE)) { if (postLighting || renderMode == SHADOW_RENDER_MODE) {
// render the billboard until both models are loaded // render the billboard until both models are loaded
renderBillboard(); renderBillboard();
}
return; return;
} }