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

Merge remote-tracking branch 'mime/freetype_benau' into freetype

Browse Source
This commit is contained in:
Benau 2015-10-12 07:38:25 +08:00
commit f20158acd1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/material_manager.cpp
View File

@ -131,8 +131,10 @@ Material* MaterialManager::getDefaultMaterial(video::E_MATERIAL_TYPE shader_type
default_material->setShaderType(Material::SHADERTYPE_SOLID_UNLIT); default_material->setShaderType(Material::SHADERTYPE_SOLID_UNLIT);
else if (shader_type == Shaders::getShader(ShaderType::ES_OBJECTPASS_REF)) else if (shader_type == Shaders::getShader(ShaderType::ES_OBJECTPASS_REF))
default_material->setShaderType(Material::SHADERTYPE_ALPHA_TEST); default_material->setShaderType(Material::SHADERTYPE_ALPHA_TEST);
else if (shader_type == Shaders::getShader(ShaderType::ES_OBJECTPASS)) //else if (shader_type == Shaders::getShader(ShaderType::ES_OBJECTPASS))
default_material->setShaderType(Material::SHADERTYPE_ALPHA_BLEND); // default_material->setShaderType(Material::SHADERTYPE_ALPHA_BLEND);
else
default_material->setShaderType(Material::SHADERTYPE_SOLID);
m_default_materials[shader_type] = default_material; m_default_materials[shader_type] = default_material;
return default_material; return default_material;