diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 21:25:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-13 21:25:03 +0400 |
| commit | be513d1b15630b629d09a6fdfa6ada808586a9dc (patch) | |
| tree | 04e41990bcdb34d645ed14c073e4e31aa5670937 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 7a3b44cf69b009fc77ffc361f5500e20131faa59 (diff) | |
fix for missing NULL checks when sequence-strip pointers become NULL because of problems with library linking.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 0432e7a62a2..528b9dff164 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -594,6 +594,9 @@ void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, int lock_range) } break; case SEQ_TYPE_MOVIECLIP: + if (seq->clip == NULL) + return; + seq->len = BKE_movieclip_get_duration(seq->clip); seq->len -= seq->anim_startofs; @@ -603,8 +606,9 @@ void BKE_sequence_reload_new_file(Scene *scene, Sequence *seq, int lock_range) } break; case SEQ_TYPE_MASK: + if (seq->mask == NULL) + return; seq->len = BKE_mask_get_duration(seq->mask); - seq->len -= seq->anim_startofs; seq->len -= seq->anim_endofs; if (seq->len < 0) { |