From 75b31b415156383b38c4d80536027c0e18de2bf7 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Thu, 8 May 2014 16:24:24 -0500 Subject: [PATCH] Fix a nullptr usage. --- indra/newview/lldrawpoolalpha.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp index 3d88b34ca..457620d96 100644 --- a/indra/newview/lldrawpoolalpha.cpp +++ b/indra/newview/lldrawpoolalpha.cpp @@ -446,7 +446,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass) llassert_always(!LLGLSLShader::sCurBoundShaderPtr); bool fullbright = depth_only || params.mFullbright; - if(fullbright == light_enabled || !initialized_lighting) + if(fullbright == !!light_enabled || !initialized_lighting) { light_enabled = !fullbright; initialized_lighting = true; @@ -536,7 +536,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass) if (params.mTexture.notNull()) { params.mTexture->addTextureStats(params.mVSize); - if (mat) + if (use_shaders && mat && current_shader) { current_shader->bindTexture(LLShaderMgr::DIFFUSE_MAP, params.mTexture); }