[Bf-blender-cvs] [a4cbacacbf8] blender-v2.83-release: Fix T73847 Overlay: Camera orthographic scale moves background image

Clément Foucault noreply at git.blender.org
Tue May 19 21:01:23 CEST 2020


Commit: a4cbacacbf8e32038e77e567a29716ede5b5db0a
Author: Clément Foucault
Date:   Tue May 19 16:29:13 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rBa4cbacacbf8e32038e77e567a29716ede5b5db0a

Fix T73847 Overlay: Camera orthographic scale moves background image

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

M	source/blender/draw/engines/overlay/overlay_image.c

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

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);



More information about the Bf-blender-cvs mailing list