[Bf-blender-cvs] [62f85ad] master: Fix T48526: Cycles viewport render incorrectly influenced by pixel aspect ratio.

Brecht Van Lommel noreply at git.blender.org
Sat May 28 11:59:06 CEST 2016


Commit: 62f85add486a83b696266012ec7115bbe30b3285
Author: Brecht Van Lommel
Date:   Sat May 28 11:54:08 2016 +0200
Branches: master
https://developer.blender.org/rB62f85add486a83b696266012ec7115bbe30b3285

Fix T48526: Cycles viewport render incorrectly influenced by pixel aspect ratio.

This reverts 72592cfb, needs more refactoring to do that cleanup.

===================================================================

M	intern/cycles/blender/blender_camera.cpp

===================================================================

diff --git a/intern/cycles/blender/blender_camera.cpp b/intern/cycles/blender/blender_camera.cpp
index 9dec489..3a0fee2 100644
--- a/intern/cycles/blender/blender_camera.cpp
+++ b/intern/cycles/blender/blender_camera.cpp
@@ -108,10 +108,6 @@ static void blender_camera_init(BlenderCamera *bcam,
 	/* render resolution */
 	bcam->full_width = render_resolution_x(b_render);
 	bcam->full_height = render_resolution_y(b_render);
-
-	/* pixel aspect */
-	bcam->pixelaspect.x = b_render.pixel_aspect_x();
-	bcam->pixelaspect.y = b_render.pixel_aspect_y();
 }
 
 static float blender_camera_focal_distance(BL::RenderEngine& b_engine,
@@ -563,6 +559,10 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings& b_render,
 		float aspectratio, sensor_size;
 		blender_camera_init(&bcam, b_render);
 
+		/* TODO(sergey): Consider making it a part of blender_camera_init(). */
+		bcam.pixelaspect.x = b_render.pixel_aspect_x();
+		bcam.pixelaspect.y = b_render.pixel_aspect_y();
+
 		blender_camera_from_object(&bcam, b_engine, b_ob);
 		blender_camera_viewplane(&bcam,
 		                         width, height,




More information about the Bf-blender-cvs mailing list