From 366efa4384e6effa6640c9f125756c58c07fcabe Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Wed, 4 Jan 2023 18:00:06 +0200
Subject: [PATCH] SL-18741 Add gltf to bulk uploads on mac
And cleaned up dupplicate mScale code
---
indra/llprimitive/llgltfmaterial.cpp | 5 -----
indra/newview/llfilepicker.cpp | 2 ++
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index e8e4b62934d..c98fd7d1ee5 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;
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 1ec25ccaa18..39bac898649 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -608,6 +608,8 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //
allowedv->push_back("dic");
allowedv->push_back("xcu");
allowedv->push_back("gif");
+ allowedv->push_back("gltf");
+ allowedv->push_back("glb");
case FFLOAD_IMAGE:
allowedv->push_back("jpg");
allowedv->push_back("jpeg");
--
GitLab