griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: EEVEE-Next: Wrong Camera Viewport Render with enabled overscan

Browse Source 
Fix for #122285

`Viewport Render Image` feature uses full parameters of the 3D view
to capture the scene.
Rendering `camera view` is a special case: viewport zoom/pan
parameters should be ignored in order to match render.

Pull Request: https://projects.blender.org/blender/blender/pulls/122467
This commit is contained in:
Vitaljok
2024-06-03 14:23:55 +02:00
committed by Clément Foucault
parent c0b8473bd6
commit 3f67abfe3c
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/blender/draw/engines/eevee_next/eevee_camera.cc
View File

@@ -132,20 +132,26 @@ void Camera::sync()
DRW_view_winmat_get(inst_.drw_view, data.winmat.ptr(), false);
}
else {
rctf viewplane;
float clip_start;
float clip_end;
bool is_ortho = ED_view3d_viewplane_get(inst_.depsgraph,
inst_.v3d,
inst_.rv3d,
UNPACK2(inst_.film.display_extent_get()),
&viewplane,
&clip_start,
&clip_end,
nullptr);
CameraParams params;
BKE_camera_params_init(&params);
RE_GetWindowMatrixWithOverscan(
is_ortho, clip_start, clip_end, viewplane, overscan_, data.winmat.ptr());
if (inst_.rv3d->persp == RV3D_CAMOB && DRW_state_is_viewport_image_render()) {
/* We are rendering camera view, no need for pan/zoom params from viewport.*/
BKE_camera_params_from_object(&params, camera_eval);
}
else {
BKE_camera_params_from_view3d(&params, inst_.depsgraph, inst_.v3d, inst_.rv3d);
}
BKE_camera_params_compute_viewplane(
&params, UNPACK2(inst_.film.display_extent_get()), 1.0f, 1.0f);
RE_GetWindowMatrixWithOverscan(params.is_ortho,
params.clip_start,
params.clip_end,
params.viewplane,
overscan_,
data.winmat.ptr());
}
}
else if (inst_.render) {