diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-04-09 10:09:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-09 10:09:10 +0300 |
| commit | 0b598651154ddaaff4ae721e1627b1f99de67d94 (patch) | |
| tree | ae0eb13472f4ace7d15c117e8ddaa8bae6677e21 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 1b72ad0c3d57e4c19a90f27106e4ffd435c0e04e (diff) | |
Fix missing NULL check
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 2fde98cce74..f5e75e17b16 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), |