diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-13 18:25:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-13 18:25:42 +0400 |
| commit | 5ad5883ce369e48fe3dfabfdd0bbacbc4eb28b17 (patch) | |
| tree | 392de032fcba15066d8341af529774abed1d6552 /source/blender/blenkernel/intern/image.c | |
| parent | a6ceb4a498dd74e855bc8a5a47120d9a1b8f879d (diff) | |
Fix crash happening on render after recent imbuf PERSISTENT flag
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 636c08fd560..c0362e3aaf3 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3102,7 +3102,9 @@ static ImBuf *image_acquire_ibuf(Image *ima, ImageUser *iuser, void **lock_r) /* always verify entirely, and potentially * returns pointer to release later */ ibuf = image_get_render_result(ima, iuser, lock_r); - ibuf->userflags |= IB_PERSISTENT; + if (ibuf) { + ibuf->userflags |= IB_PERSISTENT; + } } else if (ima->type == IMA_TYPE_COMPOSITE) { /* requires lock/unlock, otherwise don't return image */ |