diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:07:54 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-10 18:07:54 +0000 |
| commit | 54ba657e170614f5f18c84474734a5f97dedcac9 (patch) | |
| tree | cefb7a7afdb80159acbe5313f1bf4458585634fa /indra/newview | |
| parent | ef515029b69029952a2243a5270543752a87334e (diff) | |
CID-71
Checker: FORWARD_NULL
Function: LLFace::getGeometryVolume(const LLVolume &, const int &, const LLMatrix4 &, const LLMatrix3 &, const unsigned short &)
File: /indra/newview/llface.cpp
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llface.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 965ac1cad0..4a540fbe58 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1040,17 +1040,20 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, if (rebuild_color) { - GLfloat alpha[4] = - { - 0.00f, - 0.25f, - 0.5f, - 0.75f - }; - - if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) + if (tep) { - color.mV[3] = U8 (alpha[tep->getShiny()] * 255); + GLfloat alpha[4] = + { + 0.00f, + 0.25f, + 0.5f, + 0.75f + }; + + if (getPoolType() != LLDrawPool::POOL_ALPHA && (LLPipeline::sRenderDeferred || (LLPipeline::sRenderBump && tep->getShiny()))) + { + color.mV[3] = U8 (alpha[tep->getShiny()] * 255); + } } } |