diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-11-09 15:31:33 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-11-09 15:31:33 +0300 |
| commit | 41b0820dddf90c91d8016806507cbe7838e7b2d1 (patch) | |
| tree | 2dd3744bfc58a4ec0f98e4e24306569a44236ff1 /source/blender/blenkernel/intern/image.c | |
| parent | 6c24cafecc9e8353781080ebdc81ae67f9292d3b (diff) | |
| parent | 45bd98d4cff4ff5889595af8cae5d2d94a7868a1 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 8472ad5d8aa..c0efc246567 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1323,6 +1323,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; } @@ -1366,6 +1369,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)); |