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_session.cpp
parent49003dd90c45cd6f595112908ca66e28e26f5888 (diff)
Code cleanup / Cycles:
* Put render resolution x/y into a function.
Diffstat (limited to 'intern/cycles/blender/blender_session.cpp')
-rw-r--r--intern/cycles/blender/blender_session.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/blender/blender_session.cpp b/intern/cycles/blender/blender_session.cpp
index de648298ba3..076612f2d0d 100644
--- a/intern/cycles/blender/blender_session.cpp
+++ b/intern/cycles/blender/blender_session.cpp
@@ -46,8 +46,8 @@ BlenderSession::BlenderSession(BL::RenderEngine b_engine_, BL::UserPreferences b
{
/* offline render */
- width = (int)(b_render.resolution_x()*b_render.resolution_percentage()/100);
- height = (int)(b_render.resolution_y()*b_render.resolution_percentage()/100);
+ width = render_resolution_x(b_render);
+ height = render_resolution_y(b_render);
background = true;
last_redraw_time = 0.0;
@@ -129,8 +129,8 @@ void BlenderSession::reset_session(BL::BlendData b_data_, BL::Scene b_scene_)
SceneParams scene_params = BlenderSync::get_scene_params(b_scene, background);
SessionParams session_params = BlenderSync::get_session_params(b_engine, b_userpref, b_scene, background);
- width = (int)(b_render.resolution_x()*b_render.resolution_percentage()/100);
- height = (int)(b_render.resolution_y()*b_render.resolution_percentage()/100);
+ width = render_resolution_x(b_render);
+ height = render_resolution_y(b_render);
if(scene->params.modified(scene_params) ||
session->params.modified(session_params) ||