blender
/
blender
134
398
Fork 580
Code Issues 6.3k Pull Requests 759 Projects 19 Wiki Activity

2D stabilizer: Remove check for markers count in the track 

This would be a real disaster if track has no markers, which we should
not masquerade and detect such weird cases as soon as possible.
This commit is contained in:
Sergey Sharybin 2016-08-17 10:47:05 +02:00
parent 069bc4086c
commit 1e605357b5
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/tracking_stabilize.c
View File

@ -414,21 +414,18 @@ static MovieTrackingMarker *get_closest_marker(StabContext *ctx,
MovieTrackingTrack *track,
int ref_frame)
{
if (track->markersnr > 0) {
int next_lower = MINAFRAME;
int next_higher = MAXFRAME;
int i = search_closest_marker_index(track, ref_frame);
retrieve_next_higher_usable_frame(ctx, track, i, ref_frame, &next_higher);
retrieve_next_lower_usable_frame(ctx, track, i, ref_frame, &next_lower);
int next_lower = MINAFRAME;
int next_higher = MAXFRAME;
int i = search_closest_marker_index(track, ref_frame);
retrieve_next_higher_usable_frame(ctx, track, i, ref_frame, &next_higher);
retrieve_next_lower_usable_frame(ctx, track, i, ref_frame, &next_lower);
if ((next_higher - ref_frame) < (ref_frame - next_lower)) {
return BKE_tracking_marker_get_exact(track, next_higher);
}
else {
return BKE_tracking_marker_get_exact(track, next_lower);
}
if ((next_higher - ref_frame) < (ref_frame - next_lower)) {
return BKE_tracking_marker_get_exact(track, next_higher);
}
else {
return BKE_tracking_marker_get_exact(track, next_lower);
}
return NULL;
}