[Bf-blender-cvs] [2b99faed52f] master: Cleanup: move defaults into U_default struct

[Campbell Barton]

Commit: 2b99faed52fbe595db858ee9434e479eb352576d
Author: Campbell Barton
Date:   Thu Aug 1 10:03:20 2019 +1000
Branches: master
https://developer.blender.org/rB2b99faed52fbe595db858ee9434e479eb352576d

Cleanup: move defaults into U_default struct

===================================================================

M	release/datafiles/userdef/userdef_default.c
M	source/blender/blenkernel/intern/blendfile.c

===================================================================

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