ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix when GLSL disabled

Browse Source
This commit is contained in:
Marianne Gagnon 2014-05-27 19:00:55 -04:00
parent fc228c96c4
commit aa1418050d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/graphics/material.cpp
View File

@ -694,12 +694,17 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m
if (m_shader_type == SHADERTYPE_SOLID_UNLIT) if (m_shader_type == SHADERTYPE_SOLID_UNLIT)
{ {
m->MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT); if (irr_driver->isGLSL())
{
m->AmbientColor = video::SColor(255, 255, 255, 255); m->MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT);
m->DiffuseColor = video::SColor(255, 255, 255, 255); }
m->EmissiveColor = video::SColor(255, 255, 255, 255); else
m->SpecularColor = video::SColor(255, 255, 255, 255); {
m->AmbientColor = video::SColor(255, 255, 255, 255);
m->DiffuseColor = video::SColor(255, 255, 255, 255);
m->EmissiveColor = video::SColor(255, 255, 255, 255);
m->SpecularColor = video::SColor(255, 255, 255, 255);
}
} }
if (m_shader_type == SHADERTYPE_ALPHA_TEST) if (m_shader_type == SHADERTYPE_ALPHA_TEST)