diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-04-09 05:16:19 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2012-04-09 05:16:19 +0400 |
| commit | dabcdc15325702586501b5a6e401876f776d3c4c (patch) | |
| tree | 7ecbd10dbe5b3ef905dcb5e4fd632a451605add8 /source/gameengine | |
| parent | 35b483671188ca4bd418c3206809379aff179082 (diff) | |
Warning Fixes - const correctness in unicode encoding, unused variables in blenlib, and some type conversions
This is from a patch that is in the tracker, but it leaves out a fix of BLI_gzopen which needs more work.
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertProperties.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 1b7bb61fe79..a49a84a327d 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2363,8 +2363,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, frame_type = RAS_FrameSettings::e_frame_scale; } - aspect_width = blenderscene->r.xsch*blenderscene->r.xasp; - aspect_height = blenderscene->r.ysch*blenderscene->r.yasp; + aspect_width = (int)(blenderscene->r.xsch * blenderscene->r.xasp); + aspect_height = (int)(blenderscene->r.ysch * blenderscene->r.yasp); } RAS_FrameSettings frame_settings( diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp index 81a5f13b8f0..faa7780bac0 100644 --- a/source/gameengine/Converter/KX_ConvertProperties.cpp +++ b/source/gameengine/Converter/KX_ConvertProperties.cpp @@ -201,7 +201,7 @@ void BL_ConvertTextProperty(Object* object, KX_FontObject* fontobj,SCA_TimeEvent } case GPROP_FLOAT: { - float floatprop = atof(str); + float floatprop = (float)atof(str); propval = new CFloatValue(floatprop); tprop->SetValue(propval); break; @@ -214,7 +214,7 @@ void BL_ConvertTextProperty(Object* object, KX_FontObject* fontobj,SCA_TimeEvent } case GPROP_TIME: { - float floatprop = atof(str); + float floatprop = (float)atof(str); CValue* timeval = new CFloatValue(floatprop); // set a subproperty called 'timer' so that |