diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-02-24 17:37:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-24 17:37:15 -0600 |
| commit | b601bfdd6220da86b9c757180abc5ba618d9759c (patch) | |
| tree | 483e3be2650b03e85fb621697b5b313ee7324785 /indra/newview/llface.cpp | |
| parent | 37dd2c70380165b51a685b7b24829f4d3e15ddd8 (diff) | |
| parent | 6cd2a02c7fbacfd4cf2cf9055e1c282bac3afeb6 (diff) | |
Merge pull request #5452 from secondlife/develop
Develop -> 2026.02
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 2b318dcf5f..018d4c4bba 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1486,11 +1486,11 @@ bool LLFace::getGeometryVolume(const LLVolume& volume, // They are used only to display a face selection marker // (white square with a rounded cross at the center) const auto& tt = gltf_mat->mTextureTransform[gltf_info_index]; - r = -tt.mRotation * 2; - ms = tt.mScale[VX]; - mt = tt.mScale[VY]; - os += tt.mOffset[VX] + (ms - 1) / 2; - ot -= tt.mOffset[VY] + (mt - 1) / 2; + LLGLTFMaterial::convertPBRTransformToTexture( + tt.mScale, + tt.mOffset, + tt.mRotation, + ms, mt, os, ot, r); } else { |
