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

Merge remote-tracking branch 'origin/blender-v4.3-release'

Browse Source
This commit is contained in:
Ray Molenkamp
2024-11-04 11:45:11 -07:00
parent 0098fb37a8 3469dea422
commit 8eadc5eb67
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/windows_x64

Submodule lib/windows_x64 updated: 9cbf98edb0...283d5458d3

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

@@ -159,6 +159,12 @@ void Camera::sync()
params.viewplane,
overscan_,
data.winmat.ptr());
if (params.lens == 0.0f) {
/* Can happen for the case of XR.
* In this case the produced winmat is degenerate. So just revert to the input matrix. */
DRW_view_winmat_get(inst_.drw_view, data.winmat.ptr(), false);
}
}
else if (inst_.render) {
const Render *re = inst_.render->re;

8
source/blender/editors/space_view3d/view3d_draw.cc
View File

@@ -1852,6 +1852,11 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
/* Actually not used since we pass in the projection matrix. */
v3d.lens = 0;
/* WORKAROUND: Disable overscan because it is not supported for arbitrary input matrices.
* The proper fix to this would be to support arbitrary matrices in `eevee::Camera::sync()`. */
float overscan = scene->eevee.overscan;
scene->eevee.overscan = 0.0f;
ED_view3d_draw_offscreen(depsgraph,
scene,
drawtype,
@@ -1868,6 +1873,9 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph,
true,
ofs,
viewport);
/* Restore overscan. */
scene->eevee.overscan = overscan;
}
ImBuf *ED_view3d_draw_offscreen_imbuf(Depsgraph *depsgraph,