bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Cleanup: move defaults into U_default struct

Browse Source
This commit is contained in:
Campbell Barton 2019-08-01 10:03:20 +10:00
parent 1ec1797d35
commit 2b99faed52
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/datafiles/userdef/userdef_default.c
View File

@ -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,

7
source/blender/blenkernel/intern/blendfile.c
View File

@ -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);