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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-08-03 01:17:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-03 01:17:12 +0400
commite86e5074f6d4fdc455d64cc362f6b4f5005f79b8 (patch)
tree51ce01cb90655f8cae7c2e481def7caaca01703a /source/gameengine/Ketsji/KX_BlenderMaterial.cpp
parent1a5998bc4ecaf23db4dbcf41d3872019944c74ac (diff)
code cleanup: double promotion warnings
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.cpp')
-rw-r--r--source/gameengine/Ketsji/KX_BlenderMaterial.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
index b28b8c86d33..b602ba447ad 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
@@ -130,10 +130,10 @@ unsigned int* KX_BlenderMaterial::GetMCol(void) const
void KX_BlenderMaterial::GetMaterialRGBAColor(unsigned char *rgba) const
{
if (mMaterial) {
- *rgba++ = (unsigned char) (mMaterial->matcolor[0]*255.0);
- *rgba++ = (unsigned char) (mMaterial->matcolor[1]*255.0);
- *rgba++ = (unsigned char) (mMaterial->matcolor[2]*255.0);
- *rgba++ = (unsigned char) (mMaterial->matcolor[3]*255.0);
+ *rgba++ = (unsigned char)(mMaterial->matcolor[0] * 255.0f);
+ *rgba++ = (unsigned char)(mMaterial->matcolor[1] * 255.0f);
+ *rgba++ = (unsigned char)(mMaterial->matcolor[2] * 255.0f);
+ *rgba++ = (unsigned char)(mMaterial->matcolor[3] * 255.0f);
} else
RAS_IPolyMaterial::GetMaterialRGBAColor(rgba);
}