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:
Diffstat (limited to 'source/blender/src/sequence.c')
-rw-r--r--source/blender/src/sequence.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/src/sequence.c b/source/blender/src/sequence.c
index 7e2ffc3ba63..5be11a724f1 100644
--- a/source/blender/src/sequence.c
+++ b/source/blender/src/sequence.c
@@ -2949,13 +2949,16 @@ void do_render_seq(RenderResult *rr, int cfra)
(schlaile)
*/
{
- extern int mem_in_use;
- extern int mmap_in_use;
+ uintptr_t mem_in_use;
+ uintptr_t mmap_in_use;
+ uintptr_t max;
+
+ mem_in_use= MEM_get_memory_in_use();
+ mmap_in_use= MEM_get_mapped_memory_in_use();
+ max = MEM_CacheLimiter_get_maximum();
- int max = MEM_CacheLimiter_get_maximum();
if (max != 0 && mem_in_use + mmap_in_use > max) {
- fprintf(stderr, "mem_in_use = %d, max = %d\n",
- mem_in_use + mmap_in_use, max);
+ fprintf(stderr, "Memory in use > maximum memory\n");
fprintf(stderr, "Cleaning up, please wait...\n"
"If this happens very often,\n"
"consider "