diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-04 04:50:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-04 04:50:28 +0300 |
| commit | 44503282f6535d988138737f5280cae1350b5869 (patch) | |
| tree | 3ec1bbad9bca2d368c6ce6c99a203320d947a26a /indra/newview/lldrawpoolalpha.cpp | |
| parent | 3790c9ed879b015bcc91f3a9c393fbda643aa62f (diff) | |
| parent | e4906b2ab9922453b1f29d2a29b4306c2722cd1a (diff) | |
Merge remote-tracking branch 'loque-viewer/DRTVWR-580-maint-T' into marchcat/SL-19669-upd
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 ); } |