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/lllocalgltfmaterials.cpp | |
| parent | 01d667109159666150816ff728fa941d2fb54299 (diff) | |
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
Diffstat (limited to 'indra/newview/lllocalgltfmaterials.cpp')
| -rw-r--r-- | indra/newview/lllocalgltfmaterials.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lllocalgltfmaterials.cpp b/indra/newview/lllocalgltfmaterials.cpp index 5373400e9d..524693e7ea 100644 --- a/indra/newview/lllocalgltfmaterials.cpp +++ b/indra/newview/lllocalgltfmaterials.cpp @@ -259,8 +259,8 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer<LLGLTFMaterial> mat) std::string folder = gDirUtilp->getDirName(filename_lc); tinygltf::Material material_in = model_in.materials[0]; - // get albedo texture - LLPointer<LLImageRaw> albedo_img = LLTinyGLTFHelper::getTexture(folder, model_in, material_in.pbrMetallicRoughness.baseColorTexture.index); + // get base color texture + LLPointer<LLImageRaw> base_img = LLTinyGLTFHelper::getTexture(folder, model_in, material_in.pbrMetallicRoughness.baseColorTexture.index); // get normal map LLPointer<LLImageRaw> normal_img = LLTinyGLTFHelper::getTexture(folder, model_in, material_in.normalTexture.index); // get metallic-roughness texture @@ -276,12 +276,12 @@ bool LLLocalGLTFMaterial::loadMaterial(LLPointer<LLGLTFMaterial> mat) // todo: pass it into local bitmaps? LLTinyGLTFHelper::initFetchedTextures(material_in, - albedo_img, normal_img, mr_img, emissive_img, occlusion_img, - mAlbedoFetched, mNormalFetched, mMRFetched, mEmissiveFetched); + base_img, normal_img, mr_img, emissive_img, occlusion_img, + mBaseColorFetched, mNormalFetched, mMRFetched, mEmissiveFetched); - if (mAlbedoFetched) + if (mBaseColorFetched) { - mat->mAlbedoId = mAlbedoFetched->getID(); + mat->mBaseColorId= mBaseColorFetched->getID(); } if (mNormalFetched) { |