[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56866] trunk/blender/intern/cycles/ blender: Code cleanup / Cycles:

[Thomas Dinges]

Revision: 56866
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56866
Author:   dingto
Date:     2013-05-16 21:53:21 +0000 (Thu, 16 May 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Put render resolution x/y into a function.

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/blender_camera.cpp
    trunk/blender/intern/cycles/blender/blender_session.cpp
    trunk/blender/intern/cycles/blender/blender_util.h

Modified: trunk/blender/intern/cycles/blender/blender_camera.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_camera.cpp	2013-05-16 21:37:24 UTC (rev 56865)
+++ trunk/blender/intern/cycles/blender/blender_camera.cpp	2013-05-16 21:53:21 UTC (rev 56866)
@@ -82,8 +82,8 @@
 	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)

Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp	2013-05-16 21:37:24 UTC (rev 56865)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp	2013-05-16 21:53:21 UTC (rev 56866)
@@ -46,8 +46,8 @@
 {
 	/* 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 @@
 	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) ||

Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h	2013-05-16 21:37:24 UTC (rev 56865)
+++ trunk/blender/intern/cycles/blender/blender_util.h	2013-05-16 21:53:21 UTC (rev 56866)
@@ -94,6 +94,16 @@
 	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];