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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-13 16:42:40 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-13 16:47:15 +0400
commitb1bb7d2ee06d13e95154d13a6e830b8b0f845cde (patch)
tree962aa741cbdb06dd9786d62e4641b9708efd6cc8 /source/blender/imbuf/intern/moviecache.c
parentdaedf5be8c077689af1987fd6932568d9ad64a9f (diff)
Fix T38040: Crash after loading big image file in compositor
Issue was caused by cache limitor removing viewer image buffer from the memory during compositing. Now made it so all viewer images are persistent in the memory. This solves the crash mentioned above and also makes it so render/compo results are never lost. Further tweaks are possible, but pretty much happy now, at least no stoppers for work are there.
Diffstat (limited to 'source/blender/imbuf/intern/moviecache.c')
-rw-r--r--source/blender/imbuf/intern/moviecache.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c
index 3718cb270c9..00d9dd2fe04 100644
--- a/source/blender/imbuf/intern/moviecache.c
+++ b/source/blender/imbuf/intern/moviecache.c
@@ -262,7 +262,9 @@ static bool get_item_destroyable(void *item_v)
*
* Such buffers are never to be freed.
*/
- if (item->ibuf->userflags & IB_BITMAPDIRTY) {
+ if ((item->ibuf->userflags & IB_BITMAPDIRTY) ||
+ (item->ibuf->userflags & IB_PERSISTENT))
+ {
return false;
}
return true;