diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-04-26 17:16:28 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-04-26 17:19:29 -0700 |
| commit | e2dc40a76e1a6e191443c213d0f0474d36c83413 (patch) | |
| tree | a32f07a555fed8196f738e7e118af54c770ed16d /indra/newview/lldrawpoolbump.cpp | |
| parent | 369945b45da4697735bea7e925d87c65d90b2a5a (diff) | |
SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 merge
Diffstat (limited to 'indra/newview/lldrawpoolbump.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolbump.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp index 439b893e0e..75b47b2c22 100644 --- a/indra/newview/lldrawpoolbump.cpp +++ b/indra/newview/lldrawpoolbump.cpp @@ -411,12 +411,13 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, bool texture = { LLDrawInfo& params = **k; +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); - if( vobj && vobj->isAttachment() ) { trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } +#endif applyModelMatrix(params); @@ -574,6 +575,7 @@ void LLDrawPoolBump::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(); @@ -583,6 +585,7 @@ void LLDrawPoolBump::renderDeferred(S32 pass) trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } } +#endif LLGLSLShader::sCurBoundShaderPtr->setMinimumAlpha(params.mAlphaMaskCutoff); LLDrawPoolBump::bindBumpMap(params, bump_channel); @@ -1217,6 +1220,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type) { LLDrawInfo& params = **i; +#if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(params.mFace) { LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); @@ -1226,6 +1230,7 @@ void LLDrawPoolBump::pushBumpBatches(U32 type) trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } } +#endif if (LLDrawPoolBump::bindBumpMap(params)) { |