diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-07 14:59:20 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-01-07 14:59:20 -0500 |
| commit | 6b8ed2ae6f92d6f9559cbc86699b9ca3197f2e81 (patch) | |
| tree | 31919a63096b8d245bd0b834879139c9d9a82129 /indra/newview/llvovolume.cpp | |
| parent | e55193cf85e285ba229254994d88d7a875b82ef6 (diff) | |
| parent | b552f7efe94af690006ae3567eb1dbe289618c01 (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; } |