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/llvovolume.cpp | |
| parent | 01d667109159666150816ff728fa941d2fb54299 (diff) | |
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ad1711d3fb..d18997b780 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -5520,13 +5520,13 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep, LLViewerObject* vobj = facep->getViewerObject(); U8 te = facep->getTEOffset(); - draw_info->mTexture = vobj->getGLTFAlbedoMap(te); + draw_info->mTexture = vobj->getGLTFBaseColorMap(te); draw_info->mNormalMap = vobj->getGLTFNormalMap(te); draw_info->mSpecularMap = vobj->getGLTFMetallicRoughnessMap(te); draw_info->mEmissiveMap = vobj->getGLTFEmissiveMap(te); if (draw_info->mGLTFMaterial->mAlphaMode == LLGLTFMaterial::ALPHA_MODE_MASK) { - draw_info->mAlphaMaskCutoff = gltf_mat->mAlphaCutoff * gltf_mat->mAlbedoColor.mV[3]; + draw_info->mAlphaMaskCutoff = gltf_mat->mAlphaCutoff * gltf_mat->mBaseColor.mV[3]; } else { |