diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-04-21 17:20:24 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-04-21 17:20:24 -0500 |
| commit | 2515a9a65899c5f587512b86e6906a86995c502d (patch) | |
| tree | 3da743d95b75e83bb2a6eba5a84ca6aa42c7ab4a /indra/llprimitive | |
| parent | 78bb75989e36b9598852e7dcce05dce37ab0ebe1 (diff) | |
| parent | 005a5fa207d158995217cb9ecf5c214c8b2354cc (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 2 | ||||
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index f3aa5b0648..c16803d39d 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -43,7 +43,7 @@ const char* const GLTF_FILE_EXTENSION_TRANSFORM_ROTATION = "rotation"; // special UUID that indicates a null UUID in override data static const LLUUID GLTF_OVERRIDE_NULL_UUID = LLUUID("ffffffff-ffff-ffff-ffff-ffffffffffff"); -void LLGLTFMaterial::TextureTransform::getPacked(F32 (&packed)[8]) +void LLGLTFMaterial::TextureTransform::getPacked(F32 (&packed)[8]) const { packed[0] = mScale.mV[VX]; packed[1] = mScale.mV[VY]; diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h index bdabd657e1..0bd65fadef 100644 --- a/indra/llprimitive/llgltfmaterial.h +++ b/indra/llprimitive/llgltfmaterial.h @@ -61,7 +61,7 @@ public: LLVector2 mScale = { 1.f, 1.f }; F32 mRotation = 0.f; - void getPacked(F32 (&packed)[8]); + void getPacked(F32 (&packed)[8]) const; bool operator==(const TextureTransform& other) const; }; |