[Bf-blender-cvs] [0a3792a] master: Fix T47900: VSE adjustment crashes on blank frame
Campbell Barton
noreply at git.blender.org
Thu Mar 24 07:11:56 CET 2016
Commit: 0a3792a65b3ed039457f85c8538e822d6c5df222
Author: Campbell Barton
Date: Thu Mar 24 17:09:10 2016 +1100
Branches: master
https://developer.blender.org/rB0a3792a65b3ed039457f85c8538e822d6c5df222
Fix T47900: VSE adjustment crashes on blank frame
Regression, should have been included in previous fix.
===================================================================
M source/blender/blenkernel/intern/seqeffects.c
===================================================================
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 1f0c354..9cf4328 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -2363,7 +2363,9 @@ static ImBuf *do_adjustment(const SeqRenderData *context, Sequence *seq, float c
if (BKE_sequencer_input_have_to_preprocess(context, seq, cfra)) {
out = IMB_dupImBuf(i);
- IMB_metadata_copy(out, i);
+ if (out) {
+ IMB_metadata_copy(out, i);
+ }
IMB_freeImBuf(i);
}
else {
More information about the Bf-blender-cvs
mailing list