diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-15 10:24:48 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-15 10:24:48 +0400 |
| commit | beba8014e444d154124f3739f2f3edbf58c972e6 (patch) | |
| tree | 015904356120d45aa53dbca0e6feff002d3b4043 /source/blender/blenkernel/intern/tracking.c | |
| parent | a803f5d6d05159be5f94673c688dad32231c3d96 (diff) | |
Merging r50602 through r50617 form trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
| -rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index c0c5c579133..97ebc3a90ba 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -2223,8 +2223,8 @@ static ImBuf *tracking_context_get_frame_ibuf(MovieTrackingContext *context, int return ibuf; } -MovieTrackingMarker *tracking_context_get_keyframed_marker(MovieTrackingContext *context, MovieTrackingTrack *track, - MovieTrackingMarker *marker) +static MovieTrackingMarker *tracking_context_get_keyframed_marker(MovieTrackingContext *context, MovieTrackingTrack *track, + MovieTrackingMarker *marker) { int a = marker - track->markers; MovieTrackingMarker *marker_keyed = marker; |