From aa1418050d21d3264bb00db128030285c44f039f Mon Sep 17 00:00:00 2001 From: Marianne Gagnon Date: Tue, 27 May 2014 19:00:55 -0400 Subject: [PATCH] Bugfix when GLSL disabled --- src/graphics/material.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp index fae1abea6..b4b0422bc 100644 --- a/src/graphics/material.cpp +++ b/src/graphics/material.cpp @@ -694,12 +694,17 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m if (m_shader_type == SHADERTYPE_SOLID_UNLIT) { - m->MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT); - - 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 (irr_driver->isGLSL()) + { + m->MaterialType = irr_driver->getShader(ES_OBJECT_UNLIT); + } + else + { + 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)