From 366efa4384e6effa6640c9f125756c58c07fcabe Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 4 Jan 2023 18:00:06 +0200 Subject: SL-18741 Add gltf to bulk uploads on mac And cleaned up dupplicate mScale code --- indra/llprimitive/llgltfmaterial.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/llprimitive/llgltfmaterial.cpp') 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; -- cgit v1.2.3