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/llfloaterimagepreview.cpp | |
| parent | 3c276c87bde4ff9403df93434e8dc5309a3441b9 (diff) | |
| parent | defbd61d318d0da12fdea208cf2b2297d9a6b122 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterimagepreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 92ee8ddac6..6b2492d927 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -704,9 +704,13 @@ BOOL LLImagePreviewAvatar::render() // make sure alpha=0 shows avatar material color LLGLDisable no_blend(GL_BLEND); - LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool(); - gPipeline.enableLightsPreview(); - avatarPoolp->renderAvatars(avatarp); // renders only one avatar + LLFace* face = avatarp->mDrawable->getFace(0); + if (face) + { + LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)face->getPool(); + gPipeline.enableLightsPreview(); + avatarPoolp->renderAvatars(avatarp); // renders only one avatar + } } gGL.popUIMatrix(); |