diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-19 22:23:54 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-05-19 22:23:54 +0300 |
| commit | e73d7d27dc667e726b2e8c8874c3596e86e622cf (patch) | |
| tree | 6529c19f18648213fcabb00d0ed513183eafa3bc /source/blender/draw/engines/overlay | |
| parent | 08b4faef01da5207b1a864c90d1ca4353bd1e232 (diff) | |
| parent | 7bb3d9787ead90d2a389eeccf05d7be9c56f03e6 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/draw/engines/overlay')
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_image.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_image.c b/source/blender/draw/engines/overlay/overlay_image.c index c592f11a855..be3510967b6 100644 --- a/source/blender/draw/engines/overlay/overlay_image.c +++ b/source/blender/draw/engines/overlay/overlay_image.c @@ -287,6 +287,9 @@ static void image_camera_background_matrix_get(const Camera *cam, translate[3][0] = bgpic->offset[0]; translate[3][1] = bgpic->offset[1]; translate[3][2] = cam_corners[0][2]; + if (cam->type == CAM_ORTHO) { + mul_v2_fl(translate[3], cam->ortho_scale); + } /* These lines are for keeping 2.80 behavior and could be removed to keep 2.79 behavior. */ translate[3][0] *= min_ff(1.0f, cam_aspect); translate[3][1] /= max_ff(1.0f, cam_aspect) * (image_aspect / cam_aspect); |