[Bf-blender-cvs] [77d119a2311] master: Fix T63981: Factory default memory cache limit is 4096 MB

Sergey Sharybin noreply at git.blender.org
Fri May 31 12:09:22 CEST 2019


Commit: 77d119a2311133f4cda4e4780486d13d302384a6
Author: Sergey Sharybin
Date:   Fri May 31 12:06:57 2019 +0200
Branches: master
https://developer.blender.org/rB77d119a2311133f4cda4e4780486d13d302384a6

Fix T63981: Factory default memory cache limit is 4096 MB

The initialization of default settings and cache limit and audio.

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

M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index d93d4a618d7..75bd10df30e 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -358,9 +358,6 @@ static void wm_init_userdef(Main *bmain, const bool read_userdef_from_memory)
   /* versioning is here */
   UI_init_userdef(bmain);
 
-  MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024);
-  BKE_sound_init(bmain);
-
   /* needed so loading a file from the command line respects user-pref [#26156] */
   SET_FLAG_FROM_TEST(G.fileflags, U.flag & USER_FILENOUI, G_FILE_NO_UI);
 
@@ -375,6 +372,9 @@ static void wm_init_userdef(Main *bmain, const bool read_userdef_from_memory)
     BLO_update_defaults_userpref_blend();
   }
 
+  MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024);
+  BKE_sound_init(bmain);
+
   /* update tempdir from user preferences */
   BKE_tempdir_init(U.tempdir);
 }



More information about the Bf-blender-cvs mailing list