diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llface.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llmodelpreview.cpp | 3 |
3 files changed, 4 insertions, 26 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 01271ddc28..f183f49039 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10558,17 +10558,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>RenderUseMikktSpace</key> - <map> - <key>Comment</key> - <string>Use Mikkt Space tangents on GLTF materials.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>RenderUseTriStrips</key> <map> <key>Comment</key> 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) { diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp index 076ebd80c2..aa3446a308 100644 --- a/indra/newview/llmodelpreview.cpp +++ b/indra/newview/llmodelpreview.cpp @@ -1549,7 +1549,7 @@ F32 LLModelPreview::genMeshOptimizerPerModel(LLModel *base_model, LLModel *targe { new_face.resizeIndices(buf_indices_copied); new_face.resizeVertices(buf_positions_copied); - new_face.allocateTangents(buf_positions_copied, true); + new_face.allocateTangents(buf_positions_copied); S32 idx_size = (buf_indices_copied * sizeof(U16) + 0xF) & ~0xF; LLVector4a::memcpyNonAliased16((F32*)new_face.mIndices, (F32*)buffer_indices, idx_size); @@ -1839,7 +1839,6 @@ void LLModelPreview::genMeshOptimizerLODs(S32 which_lod, S32 meshopt_mode, U32 d LLVolumeFace& src = base->getVolumeFace(i); LLVolumeFace& dst = target_model->getVolumeFace(i); dst.mNormalizedScale = src.mNormalizedScale; - dst.mNormalizedTranslation = src.mNormalizedTranslation; } S32 model_meshopt_mode = meshopt_mode; |