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>2014-05-03 01:22:14 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-05-03 01:31:46 +0400
commit8d16869d833ea2a2bd548c8f7b767dae582c78f2 (patch)
tree8b4dac3292c5cb5c1c37211150633e6968814bc9 /intern/cycles/render/camera.cpp
parent43d5e54a799b6823bca31bde17606c591b81d8be (diff)
Code cleanup: Add -Werror=float-conversion to Cycles
Diffstat (limited to 'intern/cycles/render/camera.cpp')
-rw-r--r--intern/cycles/render/camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index d2e2a220861..8659fe4f7a3 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -44,8 +44,8 @@ Camera::Camera()
fisheye_lens = 10.5f;
fov = M_PI_4_F;
- sensorwidth = 0.036;
- sensorheight = 0.024;
+ sensorwidth = 0.036f;
+ sensorheight = 0.024f;
nearclip = 1e-5f;
farclip = 1e5f;