diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-09 17:10:59 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-07-09 17:12:48 +0400 |
| commit | 2af99b7437b9b590fbf81d28dc2c3f68b62f942d (patch) | |
| tree | 45b8d4e420bac7c14e5c566cbd2121be1aa6870b /source/blender/collada | |
| parent | e81b1c54d2a22790319b2cceef8a14135e2f5616 (diff) | |
Cleanup: silent C++11 warning (implicit double to float conversion) in Collada code.
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index c5443828f60..e34161f4aaa 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -522,8 +522,6 @@ static float get_property(Bone *bone, const char *key, float def) */ static void create_restpose_mat(Bone *bone, float mat[4][4]) { - const double PI = 3.1415926535897932384626433832795; - float loc[3] = { get_property(bone, "restpose_loc_x", 0.0), get_property(bone, "restpose_loc_y", 0.0), @@ -531,9 +529,9 @@ static void create_restpose_mat(Bone *bone, float mat[4][4]) }; float rot[3] = { - PI * get_property(bone, "restpose_rot_x", 0.0) / 180.0, - PI * get_property(bone, "restpose_rot_y", 0.0) / 180.0, - PI * get_property(bone, "restpose_rot_z", 0.0) / 180.0 + DEG2RADF(get_property(bone, "restpose_rot_x", 0.0)), + DEG2RADF(get_property(bone, "restpose_rot_y", 0.0)), + DEG2RADF(get_property(bone, "restpose_rot_z", 0.0)) }; float scale[3] = { |