diff options
| author | richard <none@none> | 2010-01-07 19:05:40 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-07 19:05:40 -0800 |
| commit | 96898f35e8b65beb704ed13e5fb8ef4f43497675 (patch) | |
| tree | 0815d61932ea63879b6c5257294b07a72749ec63 /indra/newview/llvovolume.cpp | |
| parent | 26d2a5fea1d87ef531a5b66a8eed712f96096f51 (diff) | |
| parent | 3a0b948bb355ab11f03173f3db06e63504ef0ac8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 70bfc67523..55609621b3 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2689,13 +2689,16 @@ U32 LLVOVolume::getRenderCost(std::set<LLUUID> &textures) const const LLTextureEntry* te = face->getTextureEntry(); const LLViewerTexture* img = face->getTexture(); - textures.insert(img->getID()); + if (img) + { + textures.insert(img->getID()); + } if (face->getPoolType() == LLDrawPool::POOL_ALPHA) { alpha++; } - else if (img->getPrimaryFormat() == GL_ALPHA) + else if (img && img->getPrimaryFormat() == GL_ALPHA) { invisi = 1; } |