diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-08-01 03:03:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-01 03:03:20 +0300 |
| commit | 2b99faed52fbe595db858ee9434e479eb352576d (patch) | |
| tree | 22a6f042800b53a74fa3b86a2ac27e833664143a | |
| parent | 1ec1797d35c28bb27e6bbadd0aec37641d7a2475 (diff) | |
Cleanup: move defaults into U_default struct
| -rw-r--r-- | release/datafiles/userdef/userdef_default.c | 13 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blendfile.c | 7 |
2 files changed, 12 insertions, 8 deletions
diff --git a/release/datafiles/userdef/userdef_default.c b/release/datafiles/userdef/userdef_default.c index e539953092b..e41e801c2f2 100644 --- a/release/datafiles/userdef/userdef_default.c +++ b/release/datafiles/userdef/userdef_default.c @@ -64,13 +64,17 @@ const UserDef U_default = { .audiorate = 48000, .audioformat = 0x24, .audiochannels = 2, - .ui_scale = 1, + + .ui_scale = 1.0, .ui_line_width = 0, - .dpi = 75, - .dpi_fac = 0.0, /* run-time. */ + + /** Default so DPI is detected automatically. */ + .dpi = 0, + .dpi_fac = 0.0, .inv_dpi_fac = 0.0, /* run-time. */ .pixelsize = 1, .virtual_pixel = 0, + .scrollback = 256, .node_margin = 80, .transopts = USER_TR_TOOLTIPS, @@ -115,7 +119,10 @@ const UserDef U_default = { .vbocollectrate = 60, .textimeout = 120, .texcollectrate = 60, + + /** Clamped by half the systems memory. */ .memcachelimit = 4096, + .prefetchframes = 0, .pad_rot_angle = 15, .rvisize = 25, diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index bc45f058fc4..e4019cce711 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -583,10 +583,6 @@ UserDef *BKE_blendfile_userdef_from_defaults(void) } } - /* default so DPI is detected automatically */ - userdef->dpi = 0; - userdef->ui_scale = 1.0f; - #ifdef WITH_PYTHON_SECURITY /* use alternative setting for security nuts * otherwise we'd need to patch the binary blob - startup.blend.c */ @@ -598,7 +594,8 @@ UserDef *BKE_blendfile_userdef_from_defaults(void) /* System-specific fonts directory. */ BKE_appdir_font_folder_default(userdef->fontdir); - userdef->memcachelimit = min_ii(BLI_system_memory_max_in_megabytes_int() / 2, 4096); + userdef->memcachelimit = min_ii(BLI_system_memory_max_in_megabytes_int() / 2, + userdef->memcachelimit); /* Init weight paint range. */ BKE_colorband_init(&userdef->coba_weight, true); |