SL-18156 Cleanup of MikktSpace integration, apply MikktSpace tangents to all meshes.

1 files changed, 3 insertions, 13 deletions

diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 5de8bda787..b24bc69791 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1968,24 +1968,14 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 			mVertexBuffer->getTangentStrider(tangent, mGeomIndex, mGeomCount, map_range);
 			F32* tangents = (F32*) tangent.get();
 			
-            LLGLTFMaterial* gltf_mat = tep->getGLTFMaterial();
-            static LLCachedControl<bool> use_mikktspace(gSavedSettings, "RenderUseMikktSpace");
-            bool mikktspace = use_mikktspace && gltf_mat != nullptr;
-
-			mVObjp->getVolume()->genTangents(f, mikktspace);
+            mVObjp->getVolume()->genTangents(f);
 			
 			LLVector4Logical mask;
 			mask.clear();
 			mask.setElement<3>();
 
-            LLVector4a* tbuff = mikktspace ? vf.mMikktSpaceTangents : vf.mTangents;
-            if (tbuff == nullptr)
-            { // non-mesh prims will not have mikktspace tangents
-                tbuff = vf.mTangents;
-            }
-
-			LLVector4a* src = tbuff;
-			LLVector4a* end = tbuff+num_vertices;
+			LLVector4a* src = vf.mTangents;
+			LLVector4a* end = vf.mTangents +num_vertices;
 
 			while (src < end)
 			{