diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-09 18:57:20 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-05-09 18:57:20 +0400 |
commit | 2ad8ec5eaf32b7c5d7291ff8c23541f84c30730c (patch) | |
tree | 11cd5ef70763f9ea6737ebc0feeefa0b5ee8cacd /source/blender/blenkernel/intern | |
parent | 602a7f77c6eead5b72a84207b02d111bf64df8cf (diff) |
Changes to footage information panel
- Display additional information about channels
and buffer type (float/byte).
- Don't show frame number beyong sequence length.
- Also fixed issues with footage length calculation,
so it's pronbably will be needed to reload some
of existing footages.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index a83ee548054..d062f302379 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -299,7 +299,6 @@ static void movieclip_calc_length(MovieClip *clip) } } else if (clip->source == MCLIP_SRC_SEQUENCE) { - int framenr = 1; unsigned short numlen; char name[FILE_MAX], head[FILE_MAX], tail[FILE_MAX]; @@ -307,18 +306,17 @@ static void movieclip_calc_length(MovieClip *clip) if (numlen == 0) { /* there's no number group in file name, assume it's single framed sequence */ - clip->len = framenr + 1; + clip->len = 1; } else { + clip->len = 0; for (;;) { - get_sequence_fname(clip, framenr, name); + get_sequence_fname(clip, clip->len + clip->start_frame, name); - if (!BLI_exists(name)) { - clip->len = framenr; + if (BLI_exists(name)) + clip->len++; + else break; - } - - framenr++; } } } |