diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-24 13:07:03 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-24 13:07:03 -0700 |
| commit | 8acaa7378f67200d4bb4018379b467f1dd8ab98d (patch) | |
| tree | 8dc3b4aff0f34ab3cf9d9b4253a3cb8318896870 /indra/newview/llface.cpp | |
| parent | bbd87a154e7b114276b027707cab00df7120acd2 (diff) | |
| parent | c5e3ace94de01ed61ed43284ea72dacec197cdc9 (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
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 && |