diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-17 16:02:57 -0700 |
| commit | d0dfffe659b24f5a6bfadc5cc612869e1f08bb93 (patch) | |
| tree | 8df3c672aba2f1aca8e9861bcf7626bd8116b107 /indra/newview/llface.cpp | |
| parent | 5e60392c273f0c9c5efa765a05414c618381780a (diff) | |
| parent | 375555012f92c1b836f2d122754f9facd050be62 (diff) | |
Merge remote-tracking branch 'origin/develop' into brad/webrtc-voice-develop
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) |