diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 21:45:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-09 21:45:22 +0400 |
| commit | 43361487bad926a9b32ce879f5b6961154507dfc (patch) | |
| tree | 6a91b1e7709fbd85c9b70e735e81db71edb20ab2 /intern/cycles/blender/blender_camera.cpp | |
| parent | 0fbb6bff27139d66951fe223ff322c609d368a18 (diff) | |
code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting).
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp index 3bc1fa34a98..cffc533f87b 100644 --- a/intern/cycles/blender/blender_camera.cpp +++ b/intern/cycles/blender/blender_camera.cpp @@ -297,7 +297,7 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int cam->fisheye_lens = bcam->fisheye_lens; /* perspective */ - cam->fov = 2.0f*atan((0.5f*sensor_size)/bcam->lens/aspectratio); + cam->fov = 2.0f * atanf((0.5f * sensor_size) / bcam->lens / aspectratio); cam->focaldistance = bcam->focaldistance; cam->aperturesize = bcam->aperturesize; cam->blades = bcam->apertureblades; @@ -405,7 +405,7 @@ static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL: } else if(b_rv3d.view_perspective() == BL::RegionView3D::view_perspective_ORTHO) { /* orthographic view */ - bcam->farclip *= 0.5; + bcam->farclip *= 0.5f; bcam->nearclip = -bcam->farclip; bcam->type = CAMERA_ORTHOGRAPHIC; |