diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:09 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:09 -0600 |
| commit | 93b1da52f56293663d9bfe5272a83a77185f4cff (patch) | |
| tree | 94a9e3da998bdc38d06cb707d1bb155f1f76b814 /indra/newview/lldrawpool.cpp | |
| parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
SL-18908 Make media texture override base color and emissive texture on PBR materials when present.
Diffstat (limited to 'indra/newview/lldrawpool.cpp')
| -rw-r--r-- | indra/newview/lldrawpool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp index a5990492b1..e35e889a69 100644 --- a/indra/newview/lldrawpool.cpp +++ b/indra/newview/lldrawpool.cpp @@ -458,7 +458,7 @@ void LLRenderPass::pushGLTFBatches(U32 type) auto& mat = params.mGLTFMaterial; - mat->bind(); + mat->bind(params.mTexture); LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0); @@ -489,7 +489,7 @@ void LLRenderPass::pushRiggedGLTFBatches(U32 type) auto& mat = params.mGLTFMaterial; - mat->bind(); + mat->bind(params.mTexture); LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0); |