diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-08 22:37:06 +0400 |
| commit | f0951f58ca2ffb1a7574beaac3217d3729e706c0 (patch) | |
| tree | 083fa0fec7f5acc563902584b8c3c015f852bbcb /source/blender/editors/space_clip | |
| parent | 0b5a995cfdca70c844186a3af9b2a01fed5e5d3f (diff) | |
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index e211b61aede..2313b176073 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -803,7 +803,7 @@ void CLIP_OT_view_selected(wmOperatorType *ot) static int change_frame_poll(bContext *C) { /* prevent changes during render */ - if (G.rendering) + if (G.is_rendering) return 0; return ED_space_clip_poll(C); @@ -1000,7 +1000,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog BKE_movieclip_build_proxy_frame(clip, pj->clip_flag, distortion, cfra, build_undistort_sizes, build_undistort_count, 1); - if (*stop || G.afbreek) + if (*stop || G.is_break) break; *do_update = TRUE; @@ -1058,7 +1058,7 @@ static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) WM_jobs_timer(steve, 0.2, NC_MOVIECLIP | ND_DISPLAY, 0); WM_jobs_callbacks(steve, proxy_startjob, NULL, NULL, proxy_endjob); - G.afbreek = 0; + G.is_break = FALSE; WM_jobs_start(CTX_wm_manager(C), steve); ED_area_tag_redraw(CTX_wm_area(C)); diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 153287eecdd..4283c6f77c7 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -952,7 +952,7 @@ typedef struct TrackMarkersJob { static int track_markers_testbreak(void) { - return G.afbreek; + return G.is_break; } static int track_count_markers(SpaceClip *sc, MovieClip *clip) @@ -1275,7 +1275,7 @@ static int track_markers_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve WM_jobs_callbacks(steve, track_markers_startjob, NULL, track_markers_updatejob, NULL); - G.afbreek = 0; + G.is_break = FALSE; WM_jobs_start(CTX_wm_manager(C), steve); WM_cursor_wait(0); @@ -1497,7 +1497,7 @@ static int solve_camera_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even WM_jobs_timer(steve, 0.1, NC_MOVIECLIP | NA_EVALUATED, 0); WM_jobs_callbacks(steve, solve_camera_startjob, NULL, solve_camera_updatejob, NULL); - G.afbreek = 0; + G.is_break = FALSE; WM_jobs_start(CTX_wm_manager(C), steve); WM_cursor_wait(0); |