sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Code cleanup / Cycles:

Browse Source 
* Put render resolution x/y into a function.
This commit is contained in:
Thomas Dinges 2013-05-16 21:53:21 +00:00
parent 49003dd90c
commit 616bc9d68f
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_camera.cpp
View File

@ -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)

8
intern/cycles/blender/blender_session.cpp
View File

@ -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) ||

10
intern/cycles/blender/blender_util.h
View File

@ -94,6 +94,16 @@ static inline bool BKE_object_is_deform_modified(BL::Object self, BL::Scene scen
return self.is_deform_modified(scene, (preview)? (1<<0): (1<<1))? true: false;
}
static inline int render_resolution_x(BL::RenderSettings b_render)
{
return b_render.resolution_x()*b_render.resolution_percentage()/100;
}
static inline int render_resolution_y(BL::RenderSettings b_render)
{
return b_render.resolution_y()*b_render.resolution_percentage()/100;
}
static inline string image_user_file_path(BL::ImageUser iuser, BL::Image ima, int cfra)
{
char filepath[1024];