[Bf-blender-cvs] [1e60535] master: 2D stabilizer: Remove check for markers count in the track
Sergey Sharybin
noreply at git.blender.org
Wed Aug 17 10:50:05 CEST 2016
Commit: 1e605357b5ed3d206e36e88dc3ebc7961b5552ef
Author: Sergey Sharybin
Date: Wed Aug 17 10:47:05 2016 +0200
Branches: master
https://developer.blender.org/rB1e605357b5ed3d206e36e88dc3ebc7961b5552ef
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.
===================================================================
M source/blender/blenkernel/intern/tracking_stabilize.c
===================================================================
diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c
index 1d57109..c352625 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -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);
-
- 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);
- }
+ 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);
}
- return NULL;
}
More information about the Bf-blender-cvs
mailing list