diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-06 16:13:38 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-09-06 16:13:38 +0300 |
commit | 469cdfd23e64889a2dfea6defd57ec78392f8723 (patch) | |
tree | 65fca60bacd02b72775e87a1dd2e8c1b4e550994 /indra/newview/pipeline.cpp | |
parent | c3bd256f3340e9223b8855368648f3925760c0b4 (diff) | |
parent | 324f3e6fd089354d26e33e63543402c0053b9845 (diff) |
Upstream merge from viewer-neko
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index a5f99676b4..65438ef05d 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8685,8 +8685,7 @@ void LLPipeline::renderDeferredLighting() } const LLViewerObject *vobj = drawablep->getVObj(); - if(vobj && vobj->getAvatar() - && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList()) + if((vobj && vobj->getAvatar() && (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())) || (vobj && dist_vec(vobj->getPosition(), LLViewerCamera::getInstance()->getOrigin()) > RenderFarClip)) { continue; |