diff options
| author | Sabrina Shanman <cosmic@lindenlab.com> | 2022-11-02 20:10:04 +0000 |
|---|---|---|
| committer | Sabrina Shanman <cosmic@lindenlab.com> | 2022-11-02 20:10:04 +0000 |
| commit | 81011a318e7cd1e4ef5bfb1f2cc52274c7d78b8a (patch) | |
| tree | 22f022676dd453143d3758c52572228f71782f42 /indra/newview/llface.cpp | |
| parent | 106b1a6e6add67f7770d508d8be1d0eff77ebd32 (diff) | |
| parent | 9e7b725c15ea0bfea5246eb81dd7a100b7ac5b6b (diff) | |
Merged in SL-18485 (pull request #1183)
SL-18485: Render GLTF materials with extension KHR_texture_transform with approprate texture transforms
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 23b56aa579..528675072b 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1601,6 +1601,12 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume, LLMaterial* mat = tep->getMaterialParams().get(); LLGLTFMaterial* gltf_mat = tep->getGLTFRenderMaterial(); + if (gltf_mat) + { + // Transforms will be applied later + do_xform = false; + } + bool do_bump = bump_code && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_TEXCOORD1); if ((mat || gltf_mat) && !do_bump) |