diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-07 09:40:27 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-07 09:40:27 -0800 |
| commit | 29d67f0c690df1d24d4533327bc99f7a56148588 (patch) | |
| tree | dc6fd659235ce6d3f0b9115750c6f708854bdd48 /indra/newview/llvovolume.cpp | |
| parent | ae7324ea34492a084300497b5da7ac611ee911e8 (diff) | |
| parent | b7bab35cb58a33014bb05f2d77b03e58d9e90651 (diff) | |
Merge latest fixes from viewer2.
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 07e5b3cf54..cde9b36de9 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -2781,13 +2781,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; } |