[Bf-blender-cvs] [9d3b6f75a13] master: Tracking: Cleanup, more clear variable naming
Sergey Sharybin
noreply at git.blender.org
Mon Nov 30 14:41:23 CET 2020
Commit: 9d3b6f75a1343c126c6d99689d41a09fd77b2c10
Author: Sergey Sharybin
Date: Mon Nov 30 14:40:00 2020 +0100
Branches: master
https://developer.blender.org/rB9d3b6f75a1343c126c6d99689d41a09fd77b2c10
Tracking: Cleanup, more clear variable naming
A no-functional-followup of the previous commit.
===================================================================
M source/blender/blenkernel/intern/tracking_auto.c
===================================================================
diff --git a/source/blender/blenkernel/intern/tracking_auto.c b/source/blender/blenkernel/intern/tracking_auto.c
index 1dc047be7bf..875299059da 100644
--- a/source/blender/blenkernel/intern/tracking_auto.c
+++ b/source/blender/blenkernel/intern/tracking_auto.c
@@ -60,7 +60,7 @@ typedef struct AutoTrackOptions {
typedef struct AutoTrackContext {
/* Frame at which tracking process started.
* NOTE: Measured in scene time frames, */
- int start_frame;
+ int start_scene_frame;
/* True when tracking backwards (from higher frame number to lower frame number.) */
bool is_backwards;
@@ -374,7 +374,7 @@ AutoTrackContext *BKE_autotrack_context_new(MovieClip *clip,
context->frame_width = frame_width;
context->frame_height = frame_height;
context->is_backwards = is_backwards;
- context->start_frame = user->framenr;
+ context->start_scene_frame = user->framenr;
context->sync_frame = user->framenr;
context->first_sync = true;
BLI_spin_init(&context->spin_lock);
@@ -554,8 +554,8 @@ void BKE_autotrack_context_finish(AutoTrackContext *context)
for (int clip_index = 0; clip_index < context->num_clips; clip_index++) {
MovieClip *clip = context->clips[clip_index];
ListBase *plane_tracks_base = BKE_tracking_get_active_plane_tracks(&clip->tracking);
- const int start_clip_frame = BKE_movieclip_remap_scene_to_clip_frame(clip,
- context->start_frame);
+ const int start_clip_frame = BKE_movieclip_remap_scene_to_clip_frame(
+ clip, context->start_scene_frame);
LISTBASE_FOREACH (MovieTrackingPlaneTrack *, plane_track, plane_tracks_base) {
if ((plane_track->flag & PLANE_TRACK_AUTOKEY)) {
More information about the Bf-blender-cvs
mailing list