blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T33762 - texture fonts were not using the material color (gameengine)

This commit is contained in:
Thomas Szepe 2014-06-18 16:55:11 +01:00 committed by Ines Almeida
parent f1a65a9fab
commit 8db9b07cb3
Notes: blender-bot 2023-09-08 04:55:43 +02:00 
Referenced by issue #33762, Texture fonts not working in single and multitexture mode.
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/gameengine/Converter/BL_BlenderDataConversion.cpp
View File

@ -889,10 +889,10 @@ static bool ConvertMaterial(
// swap the material color, so MCol on bitmap font works
if (validmat && (use_vcol == false) && (mat->game.flag & GEMAT_TEXT))
{
rgb[0] = KX_rgbaint2uint_new(rgb[0]);
rgb[1] = KX_rgbaint2uint_new(rgb[1]);
rgb[2] = KX_rgbaint2uint_new(rgb[2]);
rgb[3] = KX_rgbaint2uint_new(rgb[3]);
material->rgb[0] = KX_rgbaint2uint_new(rgb[0]);
material->rgb[1] = KX_rgbaint2uint_new(rgb[1]);
material->rgb[2] = KX_rgbaint2uint_new(rgb[2]);
material->rgb[3] = KX_rgbaint2uint_new(rgb[3]);
}
if (validmat)

8
source/gameengine/Ketsji/BL_Material.cpp
View File

@ -47,10 +47,10 @@ BL_Material::BL_Material()
void BL_Material::Initialize()
{
rgb[0] = 0;
rgb[1] = 0;
rgb[2] = 0;
rgb[3] = 0;
rgb[0] = 0xFFFFFFFFL;
rgb[1] = 0xFFFFFFFFL;
rgb[2] = 0xFFFFFFFFL;
rgb[3] = 0xFFFFFFFFL;
IdMode = 0;
ras_mode = 0;
glslmat = 0;