[Bf-blender-cvs] [0b59865] master: Fix missing NULL check

Campbell Barton noreply at git.blender.org
Thu Apr 9 09:10:39 CEST 2015


Commit: 0b598651154ddaaff4ae721e1627b1f99de67d94
Author: Campbell Barton
Date:   Thu Apr 9 17:09:10 2015 +1000
Branches: master
https://developer.blender.org/rB0b598651154ddaaff4ae721e1627b1f99de67d94

Fix missing NULL check

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

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

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 2fde98c..f5e75e1 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1505,9 +1505,15 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq, bool openfile)
 					        seq->streamindex, seq->strip->colorspace_settings.name);
 				}
 
-				seq_anim_add_suffix(scene, sanim->anim, i);
-
-				if (sanim->anim == NULL) {
+				if (sanim->anim) {
+#if 0
+					seq_anim_add_suffix(scene, sanim->anim, i);
+#else
+					/* we already have the suffix */
+					IMB_suffix_anim(sanim->anim, suffix);
+#endif
+				}
+				else {
 					if (openfile) {
 						sanim->anim = openanim(
 						        name, IB_rect | ((seq->flag & SEQ_FILTERY) ? IB_animdeinterlace : 0),




More information about the Bf-blender-cvs mailing list