Skip to content

Commit

Permalink
- added missing nullptr check.
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/hwrenderer/scene/hw_sprites.cpp

# Conflicts:
#	src/gl/scene/gl_sprite.cpp
  • Loading branch information
coelckers authored and drfrag666 committed Nov 1, 2018
1 parent 39d4db0 commit 1e84327
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/gl/scene/gl_sprite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void GLSprite::Draw(int pass)
{
gl_RenderState.AlphaFunc(GL_GEQUAL, 0.f);
}
else if (!gltexture->GetTransparent()) gl_RenderState.AlphaFunc(GL_GEQUAL, gl_mask_sprite_threshold);
else if (!gltexture || !gltexture->GetTransparent()) gl_RenderState.AlphaFunc(GL_GEQUAL, gl_mask_sprite_threshold);
else gl_RenderState.AlphaFunc(GL_GREATER, 0.f);

if (RenderStyle.BlendOp == STYLEOP_Shadow)
Expand Down

0 comments on commit 1e84327

Please sign in to comment.