Border rendering now works for all scenes used in compositor,

before this only active scene would be rendered with border.

When do_render_fields_blur_3d() is finished, it'll modify
render's display rect so it'll correspond bordered render
result placed on black backgrund. Actual border is stored
nowhere, which makes it only way to re-calculate disprect
for all other renders used in compo based on source. Not
so big deal actually.

Also needed to modify Cycles a bit, because before this
patch it used border settings from scene being rendered.
Now made it so render data is passing to external engines.

Using a property inside RenderEngine structure for this.
Not best ever design for passing render data, but this
would prevent API breakage. So now external engines could
access engine.render to access active rendering settings.

Reviewed by Brecht, thanks!

1 files changed, 29 insertions, 35 deletions

diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 0cbd2a0291f..b06ece049f1 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -65,7 +65,7 @@ struct BlenderCamera {
 	Transform matrix;
 };
 
-static void blender_camera_init(BlenderCamera *bcam, BL::Scene b_scene)
+static void blender_camera_init(BlenderCamera *bcam, BL::RenderSettings b_render, BL::Scene b_scene)
 {
 	memset(bcam, 0, sizeof(BlenderCamera));
 
@@ -82,10 +82,8 @@ static void blender_camera_init(BlenderCamera *bcam, BL::Scene b_scene)
 	bcam->pano_viewplane.top = 1.0f;
 
 	/* render resolution */
-	BL::RenderSettings r = b_scene.render();
-
-	bcam->full_width = (int)(r.resolution_x()*r.resolution_percentage()/100);
-	bcam->full_height = (int)(r.resolution_y()*r.resolution_percentage()/100);
+	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);
 }
 
 static float blender_camera_focal_distance(BL::Object b_ob, BL::Camera b_camera)
@@ -351,24 +349,22 @@ static void blender_camera_sync(Camera *cam, BlenderCamera *bcam, int width, int
 
 /* Sync Render Camera */
 
-void BlenderSync::sync_camera(BL::Object b_override, int width, int height)
+void BlenderSync::sync_camera(BL::RenderSettings b_render, BL::Object b_override, int width, int height)
 {
 	BlenderCamera bcam;
-	blender_camera_init(&bcam, b_scene);
+	blender_camera_init(&bcam, b_render, b_scene);
 
 	/* pixel aspect */
-	BL::RenderSettings r = b_scene.render();
-
-	bcam.pixelaspect.x = r.pixel_aspect_x();
-	bcam.pixelaspect.y = r.pixel_aspect_y();
-	bcam.shuttertime = r.motion_blur_shutter();
+	bcam.pixelaspect.x = b_render.pixel_aspect_x();
+	bcam.pixelaspect.y = b_render.pixel_aspect_y();
+	bcam.shuttertime = b_render.motion_blur_shutter();
 
 	/* border */
-	if(r.use_border()) {
-		bcam.border.left = r.border_min_x();
-		bcam.border.right = r.border_max_x();
-		bcam.border.bottom = r.border_min_y();
-		bcam.border.top = r.border_max_y();
+	if(b_render.use_border()) {
+		bcam.border.left = b_render.border_min_x();
+		bcam.border.right = b_render.border_max_x();
+		bcam.border.bottom = b_render.border_min_y();
+		bcam.border.top = b_render.border_max_y();
 	}
 
 	/* camera object */
@@ -406,7 +402,7 @@ void BlenderSync::sync_camera_motion(BL::Object b_ob, int motion)
 
 /* Sync 3D View Camera */
 
-static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d,
+static void blender_camera_view_subset(BL::RenderSettings b_render, BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d,
 	BL::RegionView3D b_rv3d, int width, int height, BoundBox2D *view_box, BoundBox2D *cam_box);
 
 static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height, bool skip_panorama = false)
@@ -428,7 +424,7 @@ static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL:
 				/* in panorama camera view, we map viewplane to camera border */
 				BoundBox2D view_box, cam_box;
 
-				blender_camera_view_subset(b_scene, b_ob, b_v3d, b_rv3d, width, height,
+				blender_camera_view_subset(b_scene.render(), b_scene, b_ob, b_v3d, b_rv3d, width, height,
 					&view_box, &cam_box);
 
 				bcam->pano_viewplane = view_box.make_relative_to(cam_box);
@@ -466,16 +462,15 @@ static void blender_camera_from_view(BlenderCamera *bcam, BL::Scene b_scene, BL:
 	bcam->matrix = transform_inverse(get_transform(b_rv3d.view_matrix()));
 }
 
-static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d,
+static void blender_camera_view_subset(BL::RenderSettings b_render, BL::Scene b_scene, BL::Object b_ob, BL::SpaceView3D b_v3d,
 	BL::RegionView3D b_rv3d, int width, int height, BoundBox2D *view_box, BoundBox2D *cam_box)
 {
-//	BL::RenderSettings r = b_scene.render();  /* UNUSED */
 	BoundBox2D cam, view;
 	float view_aspect, cam_aspect, sensor_size;
 
 	/* get viewport viewplane */
 	BlenderCamera view_bcam;
-	blender_camera_init(&view_bcam, b_scene);
+	blender_camera_init(&view_bcam, b_render, b_scene);
 	blender_camera_from_view(&view_bcam, b_scene, b_v3d, b_rv3d, width, height, true);
 
 	blender_camera_viewplane(&view_bcam, width, height,
@@ -483,7 +478,7 @@ static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::S
 
 	/* get camera viewplane */
 	BlenderCamera cam_bcam;
-	blender_camera_init(&cam_bcam, b_scene);
+	blender_camera_init(&cam_bcam, b_render, b_scene);
 	blender_camera_from_object(&cam_bcam, b_ob, true);
 
 	blender_camera_viewplane(&cam_bcam, cam_bcam.full_width, cam_bcam.full_height,
@@ -494,10 +489,9 @@ static void blender_camera_view_subset(BL::Scene b_scene, BL::Object b_ob, BL::S
 	*cam_box = cam * (1.0f/cam_aspect);
 }
 
-static void blender_camera_border(BlenderCamera *bcam, BL::Scene b_scene, BL::SpaceView3D b_v3d,
+static void blender_camera_border(BlenderCamera *bcam, BL::RenderSettings b_render, BL::Scene b_scene, BL::SpaceView3D b_v3d,
 	BL::RegionView3D b_rv3d, int width, int height)
 {
-	BL::RenderSettings r = b_scene.render();
 	bool is_camera_view;
 
 	/* camera view? */
@@ -517,7 +511,7 @@ static void blender_camera_border(BlenderCamera *bcam, BL::Scene b_scene, BL::Sp
 			return;
 		}
 	}
-	else if(!r.use_border())
+	else if(!b_render.use_border())
 		return;
 
 	BL::Object b_ob = (b_v3d.lock_camera_and_layers())? b_scene.camera(): b_v3d.camera();
@@ -525,15 +519,15 @@ static void blender_camera_border(BlenderCamera *bcam, BL::Scene b_scene, BL::Sp
 	if(!b_ob)
 		return;
 
-	bcam->border.left = r.border_min_x();
-	bcam->border.right = r.border_max_x();
-	bcam->border.bottom = r.border_min_y();
-	bcam->border.top = r.border_max_y();
+	bcam->border.left = b_render.border_min_x();
+	bcam->border.right = b_render.border_max_x();
+	bcam->border.bottom = b_render.border_min_y();
+	bcam->border.top = b_render.border_max_y();
 
 	/* determine camera viewport subset */
 	BoundBox2D view_box, cam_box;
 
-	blender_camera_view_subset(b_scene, b_ob, b_v3d, b_rv3d, width, height,
+	blender_camera_view_subset(b_render, b_scene, b_ob, b_v3d, b_rv3d, width, height,
 		&view_box, &cam_box);
 
 	/* determine viewport subset matching camera border */
@@ -544,14 +538,14 @@ static void blender_camera_border(BlenderCamera *bcam, BL::Scene b_scene, BL::Sp
 void BlenderSync::sync_view(BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, int width, int height)
 {
 	BlenderCamera bcam;
-	blender_camera_init(&bcam, b_scene);
+	blender_camera_init(&bcam, b_scene.render(), b_scene);
 	blender_camera_from_view(&bcam, b_scene, b_v3d, b_rv3d, width, height);
-	blender_camera_border(&bcam, b_scene, b_v3d, b_rv3d, width, height);
+	blender_camera_border(&bcam, b_scene.render(), b_scene, b_v3d, b_rv3d, width, height);
 
 	blender_camera_sync(scene->camera, &bcam, width, height);
 }
 
-BufferParams BlenderSync::get_buffer_params(BL::Scene b_scene, BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, Camera *cam, int width, int height)
+BufferParams BlenderSync::get_buffer_params(BL::RenderSettings b_render, BL::Scene b_scene, BL::SpaceView3D b_v3d, BL::RegionView3D b_rv3d, Camera *cam, int width, int height)
 {
 	BufferParams params;
 	bool use_border = false;
@@ -562,7 +556,7 @@ BufferParams BlenderSync::get_buffer_params(BL::Scene b_scene, BL::SpaceView3D b
 	if(b_v3d && b_rv3d && b_rv3d.view_perspective() != BL::RegionView3D::view_perspective_CAMERA)
 		use_border = b_v3d.use_render_border();
 	else
-		use_border = b_scene.render().use_border();
+		use_border = b_render.use_border();
 
 	if(use_border) {
 		/* border render */