- Corrected movie clip length computation
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Sep 2012 15:27:04 +0000 (15:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 24 Sep 2012 15:27:04 +0000 (15:27 +0000)
- Ignore clip's offset for movie clip sequencer strip

source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/sequencer.c

index 97d4c150b845565a2955851cda23250cf6a2d697..386e4163fd294f6f2213ef1e333598c336d9a602 100644 (file)
@@ -292,11 +292,11 @@ static void movieclip_calc_length(MovieClip *clip)
                        clip->len = framenr + 1;
                }
                else {
-                       for (;; ) {
+                       for (;;) {
                                get_sequence_fname(clip, framenr, name);
 
                                if (!BLI_exists(name)) {
-                                       clip->len = framenr + 1;
+                                       clip->len = framenr;
                                        break;
                                }
 
index f9d4b07690ba4ac25f956dab03e38e7b0e58f6dc..3d7b3dcc264390dea8fd6be8098bf57fbf88aec5 100644 (file)
@@ -2186,7 +2186,7 @@ static ImBuf *seq_render_movieclip_strip(SeqRenderData context, Sequence *seq, f
 
        memset(&user, 0, sizeof(MovieClipUser));
        
-       BKE_movieclip_user_set_frame(&user, nr + seq->anim_startofs);
+       BKE_movieclip_user_set_frame(&user, nr + seq->anim_startofs + seq->clip->start_frame);
 
        user.render_size = MCLIP_PROXY_RENDER_SIZE_FULL;