diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2019-08-01 22:40:57 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2019-08-01 22:42:01 +0300 |
| commit | 2c4dfbb00246ff59cac424392588d55363aa2400 (patch) | |
| tree | 58a6054218306e6dbcbdb5a3244eff9538d9b4c3 /source/blender/editors/space_clip/tracking_ops_track.c | |
| parent | aa0322524ea6f59068dc4ea9cef5e6f3e2a7979a (diff) | |
Fix T66028: Move sequence, movieclip and text editor progressbars to status bar
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D5219
Diffstat (limited to 'source/blender/editors/space_clip/tracking_ops_track.c')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops_track.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index e9a685f9e21..9536c64c415 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -288,7 +288,6 @@ static void track_markers_freejob(void *tmv) static int track_markers(bContext *C, wmOperator *op, bool use_job) { TrackMarkersJob *tmj; - ScrArea *sa = CTX_wm_area(C); SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); wmJob *wm_job; @@ -296,7 +295,7 @@ static int track_markers(bContext *C, wmOperator *op, bool use_job) bool sequence = RNA_boolean_get(op->ptr, "sequence"); int framenr = ED_space_clip_get_clip_frame_number(sc); - if (WM_jobs_test(CTX_wm_manager(C), sa, WM_JOB_TYPE_ANY)) { + if (WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_ANY)) { /* Only one tracking is allowed at a time. */ return OPERATOR_CANCELLED; } @@ -319,7 +318,7 @@ static int track_markers(bContext *C, wmOperator *op, bool use_job) if (use_job && sequence) { wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), - sa, + CTX_data_scene(C), "Track Markers", WM_JOB_PROGRESS, WM_JOB_TYPE_CLIP_TRACK_MARKERS); @@ -372,7 +371,7 @@ static int track_markers_invoke(bContext *C, wmOperator *op, const wmEvent *UNUS static int track_markers_modal(bContext *C, wmOperator *UNUSED(op), const wmEvent *event) { /* No running tracking, remove handler and pass through. */ - if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_wm_area(C), WM_JOB_TYPE_ANY)) { + if (0 == WM_jobs_test(CTX_wm_manager(C), CTX_data_scene(C), WM_JOB_TYPE_ANY)) { return OPERATOR_FINISHED | OPERATOR_PASS_THROUGH; } |