diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 18:03:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 18:03:31 -0700 |
| commit | 162c87a0a852952cf8dca05d37211403612a9933 (patch) | |
| tree | 3e8744a63723d3a3a3490ec6554070d0272e0f70 /indra/newview/llface.cpp | |
| parent | 100ebbab2437de7f5d124a0d7b8279a7a7b57656 (diff) | |
| parent | 15b3c9f1643368fe0c5356ea11288525bbe9fbb3 (diff) | |
Merge pull request #1746 from Ansariel/develop
Fix a few merge issues
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 52062a3ad2..0e8e64af69 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1253,10 +1253,10 @@ bool LLFace::getGeometryVolume(const LLVolume& volume, { color = tep->getColor(); - if (tep->getGLTFRenderMaterial()) - { - color = tep->getGLTFRenderMaterial()->mBaseColor; - } + if (tep->getGLTFRenderMaterial()) + { + color = tep->getGLTFRenderMaterial()->mBaseColor; + } } if (rebuild_color) |