diff options
| -rw-r--r-- | indra/newview/llface.cpp | 12 | 
1 files changed, 8 insertions, 4 deletions
| diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 1ce7454071..bb89863450 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1255,11 +1255,15 @@ bool LLFace::getGeometryVolume(const LLVolume& volume,          clearState(GLOBAL);      } -    LLColor4U color = tep->getColor(); - -    if (tep->getGLTFRenderMaterial()) +    LLColor4U color{}; +    if (tep)      { -        color = tep->getGLTFRenderMaterial()->mBaseColor; +        color = tep->getColor(); + +        if (tep->getGLTFRenderMaterial()) +        { +            color = tep->getGLTFRenderMaterial()->mBaseColor; +        }      }      if (rebuild_color) | 
