diff options
author | Dave Parks <davep@lindenlab.com> | 2022-09-23 11:19:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2022-09-23 11:19:56 -0500 |
commit | 8f1d22686551f4d6783d03cd3685085ed7fcb96c (patch) | |
tree | 09dd1c2a7c13a433e8756080638448624281a86c /indra/newview/llviewerobject.cpp | |
parent | 01d667109159666150816ff728fa941d2fb54299 (diff) |
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index f9c8f396a2..4e866658a6 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -415,7 +415,7 @@ void LLViewerObject::deleteTEImages() mTESpecularMaps = NULL; } - mGLTFAlbedoMaps.clear(); + mGLTFBaseColorMaps.clear(); mGLTFNormalMaps.clear(); mGLTFMetallicRoughnessMaps.clear(); mGLTFEmissiveMaps.clear(); @@ -4753,7 +4753,7 @@ void LLViewerObject::setNumTEs(const U8 num_tes) mTENormalMaps = new_normmaps; mTESpecularMaps = new_specmaps; - mGLTFAlbedoMaps.resize(num_tes); + mGLTFBaseColorMaps.resize(num_tes); mGLTFNormalMaps.resize(num_tes); mGLTFMetallicRoughnessMaps.resize(num_tes); mGLTFEmissiveMaps.resize(num_tes); @@ -4943,14 +4943,14 @@ void LLViewerObject::updateTEMaterialTextures(U8 te) if (mat != nullptr) { - mGLTFAlbedoMaps[te] = fetch_texture(mat->mAlbedoId); + mGLTFBaseColorMaps[te] = fetch_texture(mat->mBaseColorId); mGLTFNormalMaps[te] = fetch_texture(mat->mNormalId); mGLTFMetallicRoughnessMaps[te] = fetch_texture(mat->mMetallicRoughnessId); mGLTFEmissiveMaps[te] = fetch_texture(mat->mEmissiveId); } else { - mGLTFAlbedoMaps[te] = nullptr; + mGLTFBaseColorMaps[te] = nullptr; mGLTFNormalMaps[te] = nullptr; mGLTFMetallicRoughnessMaps[te] = nullptr; mGLTFEmissiveMaps[te] = nullptr; |