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

This commit is contained in:
hiker 2014-03-15 11:55:28 +11:00
commit de820054b6

View File

@ -132,8 +132,11 @@ void STKMeshSceneNode::drawGlow(const GLMesh &mesh)
computeMVP(ModelViewProjectionMatrix);
MeshShader::ColorizeShader::setUniforms(ModelViewProjectionMatrix, cb->getRed(), cb->getGreen(), cb->getBlue());
glBindVertexArray(mesh.vao_glow_pass);
glDrawElements(ptype, count, itype, 0);
if (mesh.vao_glow_pass != 0)
{
glBindVertexArray(mesh.vao_glow_pass);
glDrawElements(ptype, count, itype, 0);
}
}
void STKMeshSceneNode::drawDisplace(const GLMesh &mesh)