Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_view3d / view3d_ruler.c
index 904fddf9bf6625415fbfd739e19ddd036989d764..b31faa73c63fe10b07ab0d38fd8e7f8189cc4ac5 100644 (file)
@@ -491,7 +491,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
                                float quat[4];
                                float axis[3];
                                float angle;
                                float quat[4];
                                float axis[3];
                                float angle;
-                               const float px_scale = (ED_view3d_pixel_size(rv3d, ruler_item->co[1]) *
+                               const float px_scale = (ED_view3d_pixel_size_no_ui_scale(rv3d, ruler_item->co[1]) *
                                                        min_fff(arc_size,
                                                                len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
                                                                len_v2v2(co_ss[2], co_ss[1]) / 2.0f));
                                                        min_fff(arc_size,
                                                                len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
                                                                len_v2v2(co_ss[2], co_ss[1]) / 2.0f));