diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-01 13:31:13 +0400 |
| commit | 4aa82806effa9e114f14f88d7b2da23b0a2bcca6 (patch) | |
| tree | 6741012808ab0c83f96ff7e52c8168cb62b8c8b7 /source/blender/windowmanager | |
| parent | 35678eaae52a8436469b06307eaaf4d8503863f1 (diff) | |
| parent | ed0d2b5e9205fc99ed38957f01acaa62c3811333 (diff) | |
svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1df7f3228a0..a4c90888b74 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -277,7 +277,7 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist) static void wm_init_userdef(bContext *C) { UI_init_userdef(); - MEM_CacheLimiter_set_maximum(U.memcachelimit * 1024 * 1024); + MEM_CacheLimiter_set_maximum(((size_t)U.memcachelimit) * 1024 * 1024); sound_init(CTX_data_main(C)); /* needed so loading a file from the command line respects user-pref [#26156] */ |