Commit: 5ad5883ce369e48fe3dfabfdd0bbacbc4eb28b17
Author: Sergey Sharybin
Date: Mon Jan 13 20:25:42 2014 +0600
https://developer.blender.org/rB5ad5883ce369e48fe3dfabfdd0bbacbc4eb28b17
Fix crash happening on render after recent imbuf PERSISTENT flag
===================================================================
M source/blender/blenkernel/intern/image.c
===================================================================
diff --git a/source/blender/blenkernel/intern/image.c
b/source/blender/blenkernel/intern/image.c
index 636c08f..c0362e3 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
