diff options
author | Jacques Lucke <jacques@blender.org> | 2020-03-12 17:53:52 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-03-12 17:53:52 +0300 |
commit | 63ee3db961074beaf68c32ff30a21dfa65c2b122 (patch) | |
tree | b4d5dcc1345f596e37a6fb71737635fded3b3bf9 /source/blender/editors/interface | |
parent | 5929dd7129f6e8d41a79a5e01dd8b18f5369d1a8 (diff) |
Fix T73228: UI shows settings of wrong marker when movie clip is offset
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 833631f871d..3d7378181ad 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -58,6 +58,7 @@ #include "BKE_unit.h" #include "BKE_paint.h" #include "BKE_curveprofile.h" +#include "BKE_movieclip.h" #include "IMB_colormanagement.h" @@ -7339,8 +7340,10 @@ static bool ui_numedit_but_TRACKPREVIEW( } if (!scopes->track_locked) { - if (scopes->marker->framenr != scopes->framenr) { - scopes->marker = BKE_tracking_marker_ensure(scopes->track, scopes->framenr); + const MovieClip *clip = CTX_data_edit_movieclip(C); + int clip_framenr = BKE_movieclip_remap_scene_to_clip_frame(clip, scopes->framenr); + if (scopes->marker->framenr != clip_framenr) { + scopes->marker = BKE_tracking_marker_ensure(scopes->track, clip_framenr); } scopes->marker->flag &= ~(MARKER_DISABLED | MARKER_TRACKED); |