From dc813181a51ad2c22264e93a3c235cbf796b24ed Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 27 Apr 2023 12:25:50 -0700 Subject: More post-merge fixes after DRTVWR-559 & DRTVWR-539 merge --- indra/newview/lldrawpoolmaterials.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'indra/newview/lldrawpoolmaterials.cpp') diff --git a/indra/newview/lldrawpoolmaterials.cpp b/indra/newview/lldrawpoolmaterials.cpp index 3144f9a2fa..e025651cce 100644 --- a/indra/newview/lldrawpoolmaterials.cpp +++ b/indra/newview/lldrawpoolmaterials.cpp @@ -156,17 +156,6 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) F32 lastFullbright = 0.f; F32 lastMinimumAlpha = 0.f; LLVector4 lastSpecular = LLVector4(0, 0, 0, 0); - #if 0 // TODO merge brad move this down into LLCullResult begin/end loop - if(params.mFace) - { - LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); - - if( vobj && vobj->isAttachment() ) - { - trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); - } - } - #endif GLint intensity = mShader->getUniformLocation(LLShaderMgr::ENVIRONMENT_INTENSITY); GLint brightness = mShader->getUniformLocation(LLShaderMgr::EMISSIVE_BRIGHTNESS); @@ -212,6 +201,18 @@ void LLDrawPoolMaterials::renderDeferred(S32 pass) LLCullResult::increment_iterator(i, end); +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() + if(params.mFace) + { + LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); + + if( vobj && vobj->isAttachment() ) + { + trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); + } + } +#endif + if (specular > -1 && params.mSpecColor != lastSpecular) { lastSpecular = params.mSpecColor; -- cgit v1.3