Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a nullptr usage.

Browse Source
This commit is contained in:
Shyotl
2014-05-08 16:24:24 -05:00
parent f0763fd31c
commit 75b31b4151
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/lldrawpoolalpha.cpp
View File

@@ -446,7 +446,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
llassert_always(!LLGLSLShader::sCurBoundShaderPtr); llassert_always(!LLGLSLShader::sCurBoundShaderPtr);
bool fullbright = depth_only || params.mFullbright; bool fullbright = depth_only || params.mFullbright;
if(fullbright == light_enabled || !initialized_lighting) if(fullbright == !!light_enabled || !initialized_lighting)
{ {
light_enabled = !fullbright; light_enabled = !fullbright;
initialized_lighting = true; initialized_lighting = true;
@@ -536,7 +536,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask, S32 pass)
if (params.mTexture.notNull()) if (params.mTexture.notNull())
{ {
params.mTexture->addTextureStats(params.mVSize); params.mTexture->addTextureStats(params.mVSize);
if (mat) if (use_shaders && mat && current_shader)
{ {
current_shader->bindTexture(LLShaderMgr::DIFFUSE_MAP, params.mTexture); current_shader->bindTexture(LLShaderMgr::DIFFUSE_MAP, params.mTexture);
} }