[Bf-blender-cvs] [8dac88b54a6] master: Tracking: Cleanup, unused field in autotrack context
Sergey Sharybin
noreply at git.blender.org
Mon Nov 30 14:15:24 CET 2020
Commit: 8dac88b54a68671afee4e77d7038cba915ff0992
Author: Sergey Sharybin
Date: Mon Nov 30 14:13:03 2020 +0100
Branches: master
https://developer.blender.org/rB8dac88b54a68671afee4e77d7038cba915ff0992
Tracking: Cleanup, unused field in autotrack context
Was only assigned to truth, always. Never read back.
===================================================================
M source/blender/blenkernel/BKE_tracking.h
M source/blender/blenkernel/intern/tracking_auto.c
M source/blender/editors/space_clip/tracking_ops_track.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_tracking.h b/source/blender/blenkernel/BKE_tracking.h
index f92cd784ee0..2dab0a1030e 100644
--- a/source/blender/blenkernel/BKE_tracking.h
+++ b/source/blender/blenkernel/BKE_tracking.h
@@ -326,8 +326,7 @@ void BKE_tracking_refine_marker(struct MovieClip *clip,
struct AutoTrackContext *BKE_autotrack_context_new(struct MovieClip *clip,
struct MovieClipUser *user,
- const bool backwards,
- const bool sequence);
+ const bool backwards);
bool BKE_autotrack_context_step(struct AutoTrackContext *context);
void BKE_autotrack_context_sync(struct AutoTrackContext *context);
void BKE_autotrack_context_sync_user(struct AutoTrackContext *context, struct MovieClipUser *user);
diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index e7a98ba1c3f..7222f7346fc 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -74,7 +74,6 @@ typedef struct AutoTrackContext {
MovieTrackingTrack **tracks;
bool backwards;
- bool sequence;
int first_frame;
int sync_frame;
bool first_sync;
@@ -334,8 +333,7 @@ static void create_per_track_tracking_options(const MovieClip *clip,
AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
MovieClipUser *user,
- const bool backwards,
- const bool sequence)
+ const bool backwards)
{
AutoTrackContext *context = MEM_callocN(sizeof(AutoTrackContext), "autotrack context");
MovieTracking *tracking = &clip->tracking;
@@ -352,7 +350,6 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
context->frame_width = frame_width;
context->frame_height = frame_height;
context->backwards = backwards;
- context->sequence = sequence;
context->first_frame = user->framenr;
context->sync_frame = user->framenr;
context->first_sync = true;
diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c
index 66669527929..585b13b426e 100644
--- a/source/blender/editors/space_clip/tracking_ops_track.c
+++ b/source/blender/editors/space_clip/tracking_ops_track.c
@@ -185,7 +185,7 @@ static bool track_markers_initjob(bContext *C, TrackMarkersJob *tmj, bool backwa
}
}
- tmj->context = BKE_autotrack_context_new(clip, &sc->user, backwards, true);
+ tmj->context = BKE_autotrack_context_new(clip, &sc->user, backwards);
clip->tracking_context = tmj->context;
More information about the Bf-blender-cvs
mailing list