forked from bartvdbraak/blender
== Sequencer ==
Bugfix: The mem cache limitor didn't take mmap-allocated memory into account, resulting in effectively disabling it, since all imbuf-data is currently allocated using mmap.
This commit is contained in:
parent
30f1deccd0
commit
b1c30dff88
@ -68,6 +68,7 @@ extern "C" {
|
||||
extern int MEM_CacheLimiter_get_maximum();
|
||||
// this is rather _ugly_!
|
||||
extern int mem_in_use;
|
||||
extern int mmap_in_use;
|
||||
};
|
||||
#endif
|
||||
|
||||
@ -148,7 +149,7 @@ public:
|
||||
return;
|
||||
}
|
||||
for (iterator it = queue.begin();
|
||||
it != queue.end() && mem_in_use > max;) {
|
||||
it != queue.end() && mem_in_use + mmap_in_use > max;) {
|
||||
iterator jt = it;
|
||||
++it;
|
||||
(*jt)->destroy_if_possible();
|
||||
|
Loading…
Reference in New Issue
Block a user