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:
authorCampbell Barton <ideasman42@gmail.com>2019-08-01 03:03:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-08-01 03:03:20 +0300
commit2b99faed52fbe595db858ee9434e479eb352576d (patch)
tree22a6f042800b53a74fa3b86a2ac27e833664143a /source/blender/blenkernel
parent1ec1797d35c28bb27e6bbadd0aec37641d7a2475 (diff)
Cleanup: move defaults into U_default struct
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c7
1 files changed, 2 insertions, 5 deletions
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);