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:
authorThomas Dinges <blender@dingto.org>2013-05-17 01:53:21 +0400
committerThomas Dinges <blender@dingto.org>2013-05-17 01:53:21 +0400
commit616bc9d68ff6e22350f4e6f55e4cb03fe6636d3f (patch)
tree24464f5c0b55ecc4539f01afce46f8018f928f76 /intern/cycles/blender/blender_camera.cpp
parent49003dd90c45cd6f595112908ca66e28e26f5888 (diff)
Code cleanup / Cycles:
* Put render resolution x/y into a function.
Diffstat (limited to 'intern/cycles/blender/blender_camera.cpp')
-rw-r--r--intern/cycles/blender/blender_camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 6797ed6b71e..71fba5549da 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -82,8 +82,8 @@ static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings b_render
bcam->pano_viewplane.top = 1.0f;
/* render resolution */
- bcam->full_width = (int)(b_render.resolution_x()*b_render.resolution_percentage()/100);
- bcam->full_height = (int)(b_render.resolution_y()*b_render.resolution_percentage()/100);
+ bcam->full_width = render_resolution_x(b_render);
+ bcam->full_height = render_resolution_y(b_render);
}
static float blender_camera_focal_distance(BL::Object b_ob, BL::Camera b_camera)