[Bf-blender-cvs] [f280300b6ac] master: Tracking: Cleanup, remove unused argument from image accessor

[Sergey Sharybin]

Commit: f280300b6ac9a6cacfc91bee79ac7a10bd048d39
Author: Sergey Sharybin
Date:   Mon Nov 30 15:50:21 2020 +0100
Branches: master
https://developer.blender.org/rBf280300b6ac9a6cacfc91bee79ac7a10bd048d39

Tracking: Cleanup, remove unused argument from image accessor

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

M	source/blender/blenkernel/intern/tracking_auto.c
M	source/blender/blenkernel/intern/tracking_util.c
M	source/blender/blenkernel/tracking_private.h

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

diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index 0bbfa4d6d8e..d49d6779d64 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -395,7 +395,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
                                       "auto track pointers");
   /* Initialize image accessor. */
   context->image_accessor = tracking_image_accessor_new(
-      context->clips, 1, context->input_tracks, num_total_tracks, user->framenr);
+      context->clips, 1, context->input_tracks, num_total_tracks);
   /* Initialize auto track context and provide all information about currently
    * tracked markers.
    */
diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c
index c7e4e0d5c08..7146be1d521 100644
--- a/source/blender/blenkernel/intern/tracking_util.c
+++ b/source/blender/blenkernel/intern/tracking_util.c
@@ -1009,8 +1009,7 @@ static void accessor_release_mask_callback(libmv_CacheKey cache_key)
 TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR_CLIP],
                                                    int num_clips,
                                                    MovieTrackingTrack **tracks,
-                                                   int num_tracks,
-                                                   int start_frame)
+                                                   int num_tracks)
 {
   TrackingImageAccessor *accessor = MEM_callocN(sizeof(TrackingImageAccessor),
                                                 "tracking image accessor");
@@ -1024,7 +1023,6 @@ TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR
   accessor->num_clips = num_clips;
   accessor->tracks = tracks;
   accessor->num_tracks = num_tracks;
-  accessor->start_frame = start_frame;
 
   accessor->libmv_accessor = libmv_FrameAccessorNew((libmv_FrameAccessorUserData *)accessor,
                                                     accessor_get_image_callback,
diff --git a/source/blender/blenkernel/tracking_private.h b/source/blender/blenkernel/tracking_private.h
index 0965cef0d9b..5bd4baa536d 100644
--- a/source/blender/blenkernel/tracking_private.h
+++ b/source/blender/blenkernel/tracking_private.h
@@ -136,7 +136,6 @@ typedef struct TrackingImageAccessor {
   int num_clips;
   struct MovieTrackingTrack **tracks;
   int num_tracks;
-  int start_frame;
   struct libmv_FrameAccessor *libmv_accessor;
   SpinLock cache_lock;
 } TrackingImageAccessor;
@@ -144,8 +143,7 @@ typedef struct TrackingImageAccessor {
 TrackingImageAccessor *tracking_image_accessor_new(MovieClip *clips[MAX_ACCESSOR_CLIP],
                                                    int num_clips,
                                                    MovieTrackingTrack **tracks,
-                                                   int num_tracks,
-                                                   int start_frame);
+                                                   int num_tracks);
 void tracking_image_accessor_destroy(TrackingImageAccessor *accessor);
 
 #ifdef __cplusplus