Commit: 7edc16245ab0aadfdd841c7c4164de90927c4fb7
Author: Dalai Felinto
Date: Wed Oct 29 15:17:21 2014 -0200
Branches: multiview
https://developer.blender.org/rB7edc16245ab0aadfdd841c7c4164de90927c4fb7
Prevent crash when sequencer strip returns a NULL ibuf
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index d7f67b3..770f99c 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2835,7 +2835,7 @@ static ImBuf *do_render_strip_uncached(const
SeqRenderData *context, Sequence *s
char *ext = NULL;
int i;
- ibufs = MEM_mallocN(sizeof(ImBuf *) * totviews,
"Sequence Image Views Imbufs");
+ ibufs = MEM_callocN(sizeof(ImBuf *) * totviews,
"Sequence Image Views Imbufs");
BKE_scene_view_get_prefix(context->scene, name,
prefix, &ext);
for (i = 0; i < totfiles; i++) {
@@ -2856,7 +2856,7 @@ static ImBuf *do_render_strip_uncached(const
SeqRenderData *context, Sequence *s
}
}
- if (seq->views_format == R_IMF_VIEWS_STEREO_3D)
+ if (seq->views_format == R_IMF_VIEWS_STEREO_3D
&& ibufs[0])
IMB_ImBufFromStereo(seq->stereo3d_format, &ibufs[0], &ibufs[1]);
for (i = 0; i < totviews; i++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
