Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:supertuxkart/stk-code

  • Loading branch information...
commit e33fc3c1d6a0736fa7dd1f37ff342ba1f790a722 2 parents cfe93f9 + 540df39
hiker authored
Showing with 5 additions and 2 deletions.
  1. +5 −2 src/graphics/stkmesh.cpp
View
7 src/graphics/stkmesh.cpp
@@ -553,8 +553,11 @@ void drawTransparentFogObject(const GLMesh &mesh, const core::matrix4 &ModelView
tmpcol.getGreen() / 255.0f,
tmpcol.getBlue() / 255.0f);
- compressTexture(mesh.textures[0], true);
- setTexture(0, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+ if (mesh.textures[0] != NULL)
+ {
+ compressTexture(mesh.textures[0], true);
+ setTexture(0, getTextureGLuint(mesh.textures[0]), GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, true);
+ }
glUseProgram(MeshShader::TransparentFogShader::Program);
MeshShader::TransparentFogShader::setUniforms(ModelViewProjectionMatrix, TextureMatrix, fogmax, startH, endH, start, end, col, Camera::getCamera(0)->getCameraSceneNode()->getAbsolutePosition(), 0);

0 comments on commit e33fc3c

Please sign in to comment.
Something went wrong with that request. Please try again.