Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorHG1 <HG1_public@gmx.net>2014-06-18 19:55:11 +0400
committerInes Almeida <britalmeida@gmail.com>2015-02-21 15:16:20 +0300
commit8db9b07cb32edfea533072279a249725f24313c9 (patch)
treed4e4b283f5b3d1960e126e7f702af7023af3ba52 /source
parentf1a65a9fabad160900df76fdf98b6cfac6193ad5 (diff)
Fix T33762 - texture fonts were not using the material color (gameengine)
Diffstat (limited to 'source')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp8
-rw-r--r--source/gameengine/Ketsji/BL_Material.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 22ad5e1671b..b32a80dd43f 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -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)
diff --git a/source/gameengine/Ketsji/BL_Material.cpp b/source/gameengine/Ketsji/BL_Material.cpp
index 006c1f7202c..849b5e0f3c3 100644
--- a/source/gameengine/Ketsji/BL_Material.cpp
+++ b/source/gameengine/Ketsji/BL_Material.cpp
@@ -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;