diff options
| author | Logue <logue@hotmail.co.jp> | 2023-06-02 07:06:24 +0900 |
|---|---|---|
| committer | Logue <logue@hotmail.co.jp> | 2023-06-02 07:06:24 +0900 |
| commit | cca49e4d637e4f7e513647b79bef9a5c5b8820dc (patch) | |
| tree | 0213cd95e653d501dfd0c87cc60b5ba8b95b07df /indra/newview/lldrawpoolalpha.cpp | |
| parent | 6f58bc78fe2c8667e1f5ac40a309620fd98a5f36 (diff) | |
| parent | d134d155e2ddaf07ba1cdac50c1e31781e451ee5 (diff) | |
Merge branch 'DRTVWR-580-maint-T' of github.com:secondlife/viewer into DRTVWR-580-maint-T
Diffstat (limited to 'indra/newview/lldrawpoolalpha.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolalpha.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index edd0afe357..ab1ac7e30c 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -349,7 +349,7 @@ void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask) if(params.mFace) { LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); - if(vobj->isAttachment()) + if(vobj && vobj->isAttachment()) { trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } @@ -622,7 +622,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, bool depth_only, bool rigged) { LLViewerObject* vobj = (LLViewerObject *)params.mFace->getViewerObject(); - if(vobj->isAttachment()) + if(vobj && vobj->isAttachment()) { trackAttachments( vobj, params.mFace->isState(LLFace::RIGGED), &ratPtr ); } |