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.h | |
| parent | 01d667109159666150816ff728fa941d2fb54299 (diff) | |
SL-18134 Rename Albedo to Base Color to be more consistent with GLTF spec
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rw-r--r-- | indra/newview/llviewerobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 32f03c7869..1bb67fa80f 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -371,7 +371,7 @@ public: LLViewerTexture *getTENormalMap(const U8 te) const; LLViewerTexture *getTESpecularMap(const U8 te) const; - LLViewerTexture* getGLTFAlbedoMap(U8 te) const { return mGLTFAlbedoMaps[te]; } + LLViewerTexture* getGLTFBaseColorMap(U8 te) const { return mGLTFBaseColorMaps[te]; } LLViewerTexture* getGLTFNormalMap(U8 te) const { return mGLTFNormalMaps[te]; } LLViewerTexture* getGLTFEmissiveMap(U8 te) const { return mGLTFEmissiveMaps[te]; } LLViewerTexture* getGLTFMetallicRoughnessMap(U8 te) const { return mGLTFMetallicRoughnessMaps[te]; } @@ -693,7 +693,7 @@ public: LLPointer<LLViewerTexture> *mTENormalMaps; LLPointer<LLViewerTexture> *mTESpecularMaps; - std::vector<LLPointer<LLViewerTexture> > mGLTFAlbedoMaps; + std::vector<LLPointer<LLViewerTexture> > mGLTFBaseColorMaps; std::vector<LLPointer<LLViewerTexture> > mGLTFNormalMaps; std::vector<LLPointer<LLViewerTexture> > mGLTFMetallicRoughnessMaps; std::vector<LLPointer<LLViewerTexture> > mGLTFEmissiveMaps; |