diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-01-18 14:22:32 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-01-18 14:22:32 +0300 |
commit | 04230ae5921126103ebc4726ed452fdcd5183bb3 (patch) | |
tree | d53d83d11c272038aa13bc227eff01d0ef61e733 /source | |
parent | fe67b9d6f2c8c3b4e3de61e013024639ffcba844 (diff) |
fix for movie files sequence strip names not working unless the first frame of the movie was shown.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 36c6e074d4e..83bea02895e 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1066,17 +1066,19 @@ static TStripElem *give_tstripelem(Sequence *seq, int cfra) StripElem *give_stripelem(Sequence *seq, int cfra) { - StripElem *se; - int nr; + StripElem *se= seq->strip->stripdata; - se = seq->strip->stripdata; - nr = give_stripelem_index(seq, cfra); - - if (nr == -1) return 0; - if (se == 0) return 0; + if(seq->type == SEQ_MOVIE) { + /* use the first */ + } + else { + int nr = give_stripelem_index(seq, cfra); - se += nr + seq->anim_startofs; + if (nr == -1) return 0; + if (se == 0) return 0; + se += nr + seq->anim_startofs; + } return se; } |