[Bf-blender-cvs] [376eb77] master: Fix T47900: VSE adjustment crashes on blank frame

Campbell Barton noreply at git.blender.org
Wed Mar 23 19:22:25 CET 2016


Commit: 376eb77fd7c97cbec27b824dc751a318e526a9eb
Author: Campbell Barton
Date:   Thu Mar 24 05:17:38 2016 +1100
Branches: master
https://developer.blender.org/rB376eb77fd7c97cbec27b824dc751a318e526a9eb

Fix T47900: VSE adjustment crashes on blank frame

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 970825e..f479a03 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3694,8 +3694,9 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context, ListBase *seq
 					ImBuf *ibuf2 = out;
 
 					out = seq_render_strip_stack_apply_effect(context, seq, cfra, ibuf1, ibuf2);
-
-					IMB_metadata_copy(out, ibuf2);
+					if (out) {
+						IMB_metadata_copy(out, ibuf2);
+					}
 
 					IMB_freeImBuf(ibuf1);
 					IMB_freeImBuf(ibuf2);




More information about the Bf-blender-cvs mailing list