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/lldrawpoolalpha.cpp | |
parent | 369945b45da4697735bea7e925d87c65d90b2a5a (diff) |
SL-19656 disabling trackAttachments() code after DRTVWR-559 & DRTVWR-539 merge
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
-rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index dd6cfab52c..da4c963a97 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -354,6 +354,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) { LLDrawInfo& params = **k; +# if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(params.mFace) { LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); @@ -362,6 +363,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } } +#endif bool rigged = (params.mAvatar != nullptr); gHighlightProgram.bind(rigged); @@ -550,11 +552,13 @@ void LLDrawPoolAlpha::renderRiggedEmissives(std::vector<LLDrawInfo*>& emissives) for (LLDrawInfo* draw : emissives) { LL_PROFILE_ZONE_NAMED_CATEGORY_DRAWPOOL("Emissives"); +# if 0 // TODO SL-19656 figure out how to reenable trackAttachments() auto vobj = draw->mFace?draw->mFace->getViewerObject():nullptr; if(vobj && vobj->isAttachment()) { trackAttachments( vobj, draw->mFace->isState(LLFace::RIGGED), &ratPtr ); } +#endif bool tex_setup = TexSetup(draw, false); if (lastAvatar != draw->mAvatar || lastMeshId != draw->mSkinInfo->mHash) @@ -696,6 +700,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) LLRenderPass::applyModelMatrix(params); +# if 0 // TODO SL-19656 figure out how to reenable trackAttachments() if(params.mFace) { LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); @@ -705,6 +710,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } } +#endif LLMaterial* mat = NULL; LLGLTFMaterial *gltf_mat = params.mGLTFMaterial; |