2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_data.c b/source/blender/draw/engines/workbench/workbench_data.c
index bf197986687..010f424b9da 100644
--- a/source/blender/draw/engines/workbench/workbench_data.c
+++ b/source/blender/draw/engines/workbench/workbench_data.c
@@ -275,7 +275,7 @@ void workbench_update_world_ubo(WORKBENCH_PrivateData *wpd)
   copy_v2_v2(wd.viewport_size_inv, DRW_viewport_invert_size_get());
   copy_v3_v3(wd.object_outline_color, wpd->shading.object_outline_color);
   wd.object_outline_color[3] = 1.0f;
-  wd.ui_scale = G_draw.block.sizePixel;
+  wd.ui_scale = DRW_state_is_image_render() ? 1.0f : G_draw.block.sizePixel;
   wd.matcap_orientation = (wpd->shading.flag & V3D_SHADING_MATCAP_FLIP_X) != 0;
 
   workbench_studiolight_data_update(wpd, &wd);
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index 6b64a9d7f09..58d49cf226e 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -31,22 +31,22 @@ static void square_to_circle(float x, float y, float *r, float *T)
   if (x > -y) {
     if (x > y) {
       *r = x;
-      *T = (M_PI / 4.0f) * (y / x);
+      *T = M_PI_4 * (y / x);
     }
     else {
       *r = y;
-      *T = (M_PI / 4.0f) * (2 - (x / y));
+      *T = M_PI_4 * (2 - (x / y));
     }
   }
   else {
     if (x < y) {
       *r = -x;
-      *T = (M_PI / 4.0f) * (4 + (y / x));
+      *T = M_PI_4 * (4 + (y / x));
     }
     else {
       *r = -y;
       if (y != 0) {
-        *T = (M_PI / 4.0f) * (6 - (x / y));
+        *T = M_PI_4 * (6 - (x / y));
       }
       else {
         *T = 0.0f;