diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 21:15:20 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-03 21:15:20 +0400 |
commit | 95d885b3f431284b2e1eb8640771cab00b201437 (patch) | |
tree | fb4e510adcab167b59032c04461ac819e1d46e38 /intern/cycles/app/cycles_standalone.cpp | |
parent | 08d899d1e7fe0c669954b197fef0e57269edfb79 (diff) |
Quiet float conversion warnings when building cycles standalone
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 839275e47f5..074d6404f07 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -208,11 +208,11 @@ static void motion(int x, int y, int button) /* Rotate */ else if(button == 2) { - float4 r1= make_float4(x * 0.1f, 0.0f, 1.0f, 0.0f); - matrix = matrix * transform_rotate(r1.x * M_PI/180.0f, make_float3(r1.y, r1.z, r1.w)); + float4 r1= make_float4((float)x * 0.1f, 0.0f, 1.0f, 0.0f); + matrix = matrix * transform_rotate(DEG2RADF(r1.x), make_float3(r1.y, r1.z, r1.w)); - float4 r2 = make_float4(y * 0.1, 1.0f, 0.0f, 0.0f); - matrix = matrix * transform_rotate(r2.x * M_PI/180.0f, make_float3(r2.y, r2.z, r2.w)); + float4 r2 = make_float4(y * 0.1f, 1.0f, 0.0f, 0.0f); + matrix = matrix * transform_rotate(DEG2RADF(r2.x), make_float3(r2.y, r2.z, r2.w)); } /* Update and Reset */ |