diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-04 18:00:06 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-01-06 17:32:50 +0200 |
| commit | 366efa4384e6effa6640c9f125756c58c07fcabe (patch) | |
| tree | f5d38f66a6041ae2e65717a865ab1684db06cbc6 /indra/llprimitive/llgltfmaterial.cpp | |
| parent | 3290f16f29e503115b7eaeb2005cfdbba42668dd (diff) | |
SL-18741 Add gltf to bulk uploads on mac
And cleaned up dupplicate mScale code
Diffstat (limited to 'indra/llprimitive/llgltfmaterial.cpp')
| -rw-r--r-- | indra/llprimitive/llgltfmaterial.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp index e8e4b62934..c98fd7d1ee 100644 --- a/indra/llprimitive/llgltfmaterial.cpp +++ b/indra/llprimitive/llgltfmaterial.cpp @@ -646,11 +646,6 @@ void LLGLTFMaterial::applyOverride(const LLGLTFMaterial& override_mat) mTextureTransform[i].mScale = override_mat.mTextureTransform[i].mScale; } - if (override_mat.mTextureTransform[i].mScale != getDefaultTextureScale()) - { - mTextureTransform[i].mScale = override_mat.mTextureTransform[i].mScale; - } - if (override_mat.mTextureTransform[i].mRotation != getDefaultTextureRotation()) { mTextureTransform[i].mRotation = override_mat.mTextureTransform[i].mRotation; |