diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-04-27 16:33:18 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-04-27 16:41:40 +0300 |
| commit | b315fcb7edb7222c97facc2413d3772702533dd2 (patch) | |
| tree | bfe85841a38142d9fe185f8f235d449a09d071d3 /source/blender/blenkernel/intern/image.c | |
| parent | e1ed47eb5b6ec3f1501bed0b34bfa7894acee022 (diff) | |
Fix T44514 Crash under cycles rendering using F12, based on patch from Gaia Clary
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 b9a76a125a4..d76537ab696 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -3582,10 +3582,12 @@ static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser, void **lock_ rectz = rv->rectz; } else { - /* XXX This should never happen, yet it does - T44498 + /* XXX This should never happen, yet it does - T44498, T44514 * I'm waiting to investigate more, but meanwhile this fix * the immediate issue */ rect = NULL; + rectf = NULL; + rectz = NULL; } dither = iuser->scene->r.dither_intensity; |