livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-18190 Fix for texture animation not working on opaque PBR materials.

master
Dave Parks 2022-09-22 18:10:50 -05:00
parent 0afc237de2
commit 43822fa6e4
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/lldrawpoolpbropaque.cpp
View File

@ -148,6 +148,16 @@ void LLDrawPoolPBROpaque::renderDeferred(S32 pass)
LLGLDisable cull_face(mat->mDoubleSided ? GL_CULL_FACE : 0);
bool tex_setup = false;
if (pparams->mTextureMatrix)
{ //special case implementation of texture animation here because of special handling of textures for PBR batches
tex_setup = true;
gGL.getTexUnit(0)->activate();
gGL.matrixMode(LLRender::MM_TEXTURE);
gGL.loadMatrix((GLfloat*)pparams->mTextureMatrix->mMatrix);
gPipeline.mTextureMatrixOps++;
}
if (rigged)
{
if (pparams->mAvatar.notNull() && (lastAvatar != pparams->mAvatar || lastMeshId != pparams->mSkinInfo->mHash))
@ -163,6 +173,13 @@ void LLDrawPoolPBROpaque::renderDeferred(S32 pass)
{
pushBatch(*pparams, vertex_data_mask, FALSE, FALSE);
}
if (tex_setup)
{
gGL.matrixMode(LLRender::MM_TEXTURE0);
gGL.loadIdentity();
gGL.matrixMode(LLRender::MM_MODELVIEW);
}
}
}