diff options
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 6 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/moviecache.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index c9ac1f32804..311199f8833 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1304,6 +1304,9 @@ void BKE_image_print_memlist(Main *bmain) static bool imagecache_check_dirty(ImBuf *ibuf, void *UNUSED(userkey), void *UNUSED(userdata)) { + if (ibuf == NULL) { + return false; + } return (ibuf->userflags & IB_BITMAPDIRTY) == 0; } @@ -1347,6 +1350,9 @@ void BKE_image_free_all_textures(Main *bmain) static bool imagecache_check_free_anim(ImBuf *ibuf, void *UNUSED(userkey), void *userdata) { + if (ibuf == NULL) { + return true; + } int except_frame = *(int *)userdata; return (ibuf->userflags & IB_BITMAPDIRTY) == 0 && (ibuf->index != IMA_NO_INDEX) && (except_frame != IMA_INDEX_ENTRY(ibuf->index)); diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index 6e7b85a300a..4f316150e10 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -237,6 +237,9 @@ static int get_item_priority(void *item_v, int default_priority) static bool get_item_destroyable(void *item_v) { MovieCacheItem *item = (MovieCacheItem *)item_v; + if (item->ibuf == NULL) { + return true; + } /* IB_BITMAPDIRTY means image was modified from inside blender and * changes are not saved to disk. * |