diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-27 10:24:53 -0700 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2022-06-27 10:24:53 -0700 |
| commit | acdd77d4ce31a5014eff72f18b374e877001adf9 (patch) | |
| tree | 2345c2ac7b2e1c8c1b341ccf6ff1e65993d8dea3 /indra/newview/llface.cpp | |
| parent | fbb6eb216f5dc06ff5c7c1cabc6ab46a94918e1b (diff) | |
| parent | 231c618a844cee26a3779b703c88d8807df872e6 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index d1ea5409ed..071e770811 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1384,6 +1384,11 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLColor4U color = tep->getColor(); + if (tep->getGLTFMaterial()) + { + color = tep->getGLTFMaterial()->mAlbedoColor; + } + if (rebuild_color) { //decide if shiny goes in alpha channel of color if (tep && |