Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fixed broken camera motion blur when motion was not set to center on frame

Browse Source 
Reviewers: #cycles, sergey

Reviewed By: #cycles, sergey

Subscribers: sergey

Differential Revision: https://developer.blender.org/D2787
This commit is contained in:
Stefan Werner
2017-08-12 22:04:42 +02:00
parent 595cfd2a81
commit 86eb8980d3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -544,7 +544,11 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings& b_render,
if(tfm != cam->matrix) { if(tfm != cam->matrix) {
VLOG(1) << "Camera " << b_ob.name() << " motion detected."; VLOG(1) << "Camera " << b_ob.name() << " motion detected.";
if(motion_time == -1.0f) { if(motion_time == 0.0f) {
/* When motion blur is not centered in frame, cam->matrix gets reset. */
cam->matrix = tfm;
}
else if(motion_time == -1.0f) {
cam->motion.pre = tfm; cam->motion.pre = tfm;
cam->use_motion = true; cam->use_motion = true;
} }
@@ -573,7 +577,10 @@ void BlenderSync::sync_camera_motion(BL::RenderSettings& b_render,
float fov = 2.0f * atanf((0.5f * sensor_size) / bcam.lens / aspectratio); float fov = 2.0f * atanf((0.5f * sensor_size) / bcam.lens / aspectratio);
if(fov != cam->fov) { if(fov != cam->fov) {
VLOG(1) << "Camera " << b_ob.name() << " FOV change detected."; VLOG(1) << "Camera " << b_ob.name() << " FOV change detected.";
if(motion_time == -1.0f) { if(motion_time == 0.0f) {
cam->fov = fov;
}
else if(motion_time == -1.0f) {
cam->fov_pre = fov; cam->fov_pre = fov;
cam->use_perspective_motion = true; cam->use_perspective_motion = true;
} }