diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-02 12:07:44 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-02 12:11:35 +0400 |
| commit | eed3974d11af6072174a43f6b103c9b64be054e2 (patch) | |
| tree | 23d2303f64719e3250ff7d2996e6224b9505e55b /source/blender/blenkernel/intern/movieclip.c | |
| parent | def5999f9b04368aa21485b514c0931f6fb43d8e (diff) | |
Fix T39545: "Track selected markers", does not stop at end of video
Issue was cauzed by some weird clamping of current frame. Not sure
why it was here at the first point -- it's from the day0 of movie
clip datablock.
Diffstat (limited to 'source/blender/blenkernel/intern/movieclip.c')
| -rw-r--r-- | source/blender/blenkernel/intern/movieclip.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c index d4179be78ef..8cdf29849e5 100644 --- a/source/blender/blenkernel/intern/movieclip.c +++ b/source/blender/blenkernel/intern/movieclip.c @@ -280,17 +280,8 @@ static ImBuf *movieclip_load_movie_file(MovieClip *clip, MovieClipUser *user, in movieclip_open_anim_file(clip); if (clip->anim) { - int dur; - int fra; - - dur = IMB_anim_get_duration(clip->anim, tc); - fra = framenr - clip->start_frame + clip->frame_offset; - - if (fra < 0) - fra = 0; - - if (fra > (dur - 1)) - fra = dur - 1; + int dur = IMB_anim_get_duration(clip->anim, tc); + int fra = framenr - clip->start_frame + clip->frame_offset; ibuf = IMB_anim_absolute(clip->anim, fra, tc, proxy); } |