Page MenuHome
Differential D8452

Fix T79453: Motion Tracking: marker does not remember 'enabled' state
ClosedPublic
Actions

Authored by Philipp Oeser (lichtwerk) on Aug 3 2020, 4:02 PM.

Details

Reviewers
Sergey Sharybin (sergey)
Jacques Lucke (JacquesLucke)
Maniphest Tasks
T79453: Motion Tracking: marker does not remember 'enabled' state
Summary

Caused by rB63ee3db96107.

While above commit corrected the clip offset, it also removed logic to
ensure a marker on a particular frame. This is needed though, otherwise
changes on a particular frame are applied to the marker being returned
by 'BKE_tracking_marker_get' which can be a completely different marker
if none exist for that frame yet.

This patch partly reverts rB63ee3db96107 and reintroduces the framenr
for the MarkerUpdateCb and uses that to ensure a marker on that frame.

Candidate for backporting to 2.83 LTS?

Diff Detail

Repository
rB Blender
Branch
T79453_ (branched from master)
Build Status
Buildable 9314
Build 9314: arc lint + arc unit

Event Timeline

Philipp Oeser (lichtwerk) created this revision.Aug 3 2020, 4:02 PM
Harbormaster completed remote builds in B9314: Diff 27365.Aug 3 2020, 4:02 PM
Philipp Oeser (lichtwerk) requested review of this revision.Aug 3 2020, 4:02 PM
Philipp Oeser (lichtwerk) added a project: VFX & Video.Aug 3 2020, 4:03 PM
Sergey Sharybin (sergey) added a comment.Aug 3 2020, 4:07 PM

I think you still need to remap frame using BKE_movieclip_remap_scene_to_clip_frame.

Philipp Oeser (lichtwerk) updated this revision to Diff 27368.Aug 3 2020, 4:40 PM

offset the 'ensured' marker as well

Harbormaster completed remote builds in B9315: Diff 27368.Aug 3 2020, 4:40 PM
Sergey Sharybin (sergey) added a comment.Aug 3 2020, 5:07 PM

From reading the code seems fine.
Did you verify it with the offset set to some non-default value?

Philipp Oeser (lichtwerk) added a comment.Aug 3 2020, 5:20 PM
In D8452#206041, @Sergey Sharybin (sergey) wrote:

Did you verify it with the offset set to some non-default value?

Yes, changing footage Start Frame works correctly now [wasnt in the first version of this patch, doh!, thx for having an eye on that]

Jacques Lucke (JacquesLucke) accepted this revision.Aug 4 2020, 12:27 PM
Jacques Lucke (JacquesLucke) added inline comments.
source/blender/editors/space_clip/clip_buttons.c
300

Move declaration down to where marker is initialized.

This revision is now accepted and ready to land.Aug 4 2020, 12:27 PM
Sergey Sharybin (sergey) accepted this revision.Aug 4 2020, 12:52 PM

Seems fine, but before pushing address Jacques's comment.

Philipp Oeser (lichtwerk) closed this revision.Aug 4 2020, 1:03 PM
Philipp Oeser (lichtwerk) mentioned this in rBf921ae466583: Fix T79453: Motion Tracking: marker does not remember 'enabled' state.

Commited, rBf921ae466583: Fix T79453: Motion Tracking: marker does not remember 'enabled' state

Revision Contents
Changeset List

PathSize
source/
blender/
editors/
space_clip/
9 lines

Diff 27365

View Options

source/blender/editors/space_clip/clip_buttons.c

Loading...