diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-18 05:29:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-18 05:29:15 +0300 |
| commit | 3c690aa4bc88c8c8643957a30f440a375237e87e (patch) | |
| tree | f32aefaf455a682fd7096c3411bdd88f8d0e10c7 /source/blender/makesdna | |
| parent | c65c66320fc8014a8fa5a09690666441f5c2556c (diff) | |
| parent | d1057890c40b6f50d0a13215eec90ab1af03a44b (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index c2ed6c97d3d..136fe3744ef 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -689,16 +689,17 @@ typedef struct UserDef { int audioformat; int audiochannels; - /** Setting for UI scale. */ + /** Setting for UI scale (fractional), before screen DPI has been applied. */ float ui_scale; /** Setting for UI line width. */ int ui_line_width; /** Runtime, full DPI divided by `pixelsize`. */ int dpi; - /** Runtime, multiplier to scale UI elements based on DPI. */ + /** Runtime, multiplier to scale UI elements based on DPI (fractional). */ float dpi_fac; + /** Runtime, `1.0 / dpi_fac` */ float inv_dpi_fac; - /** Runtime, line width and point size based on DPI. */ + /** Runtime, calculated from line-width and point-size based on DPI (rounded to int). */ float pixelsize; /** Deprecated, for forward compatibility. */ int virtual_pixel; |