[Bf-blender-cvs] [eed3974] master: Fix T39545: "Track selected markers", does not stop at end of video
Sergey Sharybin
noreply at git.blender.org
Wed Apr 2 10:11:50 CEST 2014
Commit: eed3974d11af6072174a43f6b103c9b64be054e2
Author: Sergey Sharybin
Date: Wed Apr 2 14:07:44 2014 +0600
https://developer.blender.org/rBeed3974d11af6072174a43f6b103c9b64be054e2
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.
===================================================================
M source/blender/blenkernel/intern/movieclip.c
===================================================================
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index d4179be..8cdf298 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);
}
More information about the Bf-blender-cvs
mailing list