[Bf-blender-cvs] [1fb8bbc] master: 2D stabilizer: Use exact getter instead of regular one followed with frame check

[Sergey Sharybin]

Commit: 1fb8bbcd3e978444e76ddbb090268b824b9d9894
Author: Sergey Sharybin
Date:   Wed Aug 17 10:49:42 2016 +0200
Branches: master
https://developer.blender.org/rB1fb8bbcd3e978444e76ddbb090268b824b9d9894

2D stabilizer: Use exact getter instead of regular one followed with frame check

===================================================================

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 c352625..4d72d85 100644
--- a/source/blender/blenkernel/intern/tracking_stabilize.c
+++ b/source/blender/blenkernel/intern/tracking_stabilize.c
@@ -438,16 +438,16 @@ static MovieTrackingMarker *get_tracking_data_point(
         StabContext *ctx,
         MovieTrackingTrack *track,
         int framenr,
-        float *weight)
+        float *r_weight)
 {
-	MovieTrackingMarker *marker = BKE_tracking_marker_get(track, framenr);
-	if (marker && marker->framenr == framenr && !(marker->flag & MARKER_DISABLED)) {
-		*weight = get_animated_weight(ctx, track, framenr);
+	MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, framenr);
+	if (marker != NULL && !(marker->flag & MARKER_DISABLED)) {
+		*r_weight = get_animated_weight(ctx, track, framenr);
 		return marker;
 	}
 	else {
-		/* no marker at this frame (=gap) or marker disabled */
-		*weight = 0.0f;
+		/* No marker at this frame (=gap) or marker disabled. */
+		*r_weight = 0.0f;
 		return NULL;
 	}
 }