diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-27 12:54:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-27 12:54:37 +0400 |
| commit | d334f04ee66c1373eacaf51855454fda6a08bc64 (patch) | |
| tree | 08a0bf8ea613758f8ac859e52d09274ab443bd99 /source/blender/blenkernel/intern/sequencer.c | |
| parent | 05abdf344bb8366a1a4da145c423688b81a38459 (diff) | |
reload_sequence_new_file now works with movie clip strips as well
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 18749d7b5a6..210ee27d914 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -643,7 +643,7 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range) int prev_startdisp=0, prev_enddisp=0; /* note: don't rename the strip, will break animation curves */ - if (ELEM5(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META)==0) { + if (ELEM6(seq->type, SEQ_MOVIE, SEQ_IMAGE, SEQ_SOUND, SEQ_SCENE, SEQ_META, SEQ_MOVIECLIP)==0) { return; } @@ -693,6 +693,15 @@ void reload_sequence_new_file(Scene *scene, Sequence * seq, int lock_range) seq->len = 0; } break; + case SEQ_MOVIECLIP: + seq->len = BKE_movieclip_get_duration(seq->clip); + + seq->len -= seq->anim_startofs; + seq->len -= seq->anim_endofs; + if (seq->len < 0) { + seq->len = 0; + } + break; case SEQ_SOUND: #ifdef WITH_AUDASPACE if (!seq->sound) |