diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-25 11:04:25 +0300 |
commit | ef22d2e8adb9965cd3cb91e733d4b9754cf6024f (patch) | |
tree | 1d95a52cd619be4b9974c6aa2f197373a1831912 /source/blender/editors/include | |
parent | 2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8 (diff) | |
parent | d02335a1950c81fffea815f31e47bca92ab7d33c (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_view3d.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 9ddc826244e..0a8eced8e59 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -227,6 +227,7 @@ eV3DProjStatus ED_view3d_project_float_global(const struct ARegion *ar, const fl eV3DProjStatus ED_view3d_project_float_object(const struct ARegion *ar, const float co[3], float r_co[2], const eV3DProjTest flag); float ED_view3d_pixel_size(const struct RegionView3D *rv3d, const float co[3]); +float ED_view3d_pixel_size_no_ui_scale(const struct RegionView3D *rv3d, const float co[3]); float ED_view3d_calc_zfac(const struct RegionView3D *rv3d, const float co[3], bool *r_flip); bool ED_view3d_clip_segment(const struct RegionView3D *rv3d, float ray_start[3], float ray_end[3]); |