Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-08-18 12:03:29 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-08-18 12:03:29 +0300
commitde7470645a30e7bc6db67eff64d11778fb5ee3f2 (patch)
tree0e63bf0108c952ac7ada93a368cd1291d0555ac3 /source/blender/makesdna
parent3f0e2dba681f04bb70e06328d5c6439ce1290896 (diff)
parentbe30023c68d463ec8d12b1b848bebf5fa7a2c288 (diff)
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h7
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;