diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-19 17:23:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-19 17:23:54 -0500 |
| commit | 8741c05cc10d3f39f272bb4739e7313309539d07 (patch) | |
| tree | 871d2340a7e22cce1504948a79a703811a084d5a /indra/newview/llface.cpp | |
| parent | de4c018499ddaebbe466fb5a8938554a2d4a3b19 (diff) | |
SL-18105 Hook up TE override material to render pipe by way of render material.
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 4ae8335ca7..23b56aa579 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1334,9 +1334,9 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLColor4U color = tep->getColor(); - if (tep->getGLTFMaterial()) + if (tep->getGLTFRenderMaterial()) { - color = tep->getGLTFMaterial()->mBaseColor; + color = tep->getGLTFRenderMaterial()->mBaseColor; } if (rebuild_color) @@ -1599,7 +1599,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, scalea.load3(scale.mV); LLMaterial* mat = tep->getMaterialParams().get(); - LLGLTFMaterial* gltf_mat = tep->getGLTFMaterial(); + LLGLTFMaterial* gltf_mat = tep->getGLTFRenderMaterial(); bool do_bump = bump_code && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1); |