diff options
author | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-06-22 14:04:33 -0500 |
commit | 9e9d32de384b2807f195be48f49fbdec725f45d1 (patch) | |
tree | 802158bd1a8872500ffeee286256f4c3ff79ef72 /indra/newview/llfloaterbvhpreview.cpp | |
parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterbvhpreview.cpp')
-rw-r--r-- | indra/newview/llfloaterbvhpreview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterbvhpreview.cpp b/indra/newview/llfloaterbvhpreview.cpp index ac33a05f42..fa0ad20fdb 100644 --- a/indra/newview/llfloaterbvhpreview.cpp +++ b/indra/newview/llfloaterbvhpreview.cpp @@ -1124,9 +1124,13 @@ BOOL LLPreviewAnimation::render() LLVertexBuffer::unbind(); LLGLDepthTest gls_depth(GL_TRUE); - LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool(); - avatarp->dirtyMesh(); - avatarPoolp->renderAvatars(avatarp); // renders only one avatar + LLFace* face = avatarp->mDrawable->getFace(0); + if (face) + { + LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)face->getPool(); + avatarp->dirtyMesh(); + avatarPoolp->renderAvatars(avatarp); // renders only one avatar + } } gGL.color4f(1,1,1,1); |