Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-28 09:17:15 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-28 09:17:15 +0300
commit7bf8d8b3c89cfda3245c1e36e03279c1c970740b (patch)
tree2798d49b84cbe33993d2526bc463f44791c29183 /source/blender/editors/space_clip/space_clip.c
parent8d81a3da37c45d2b61f1616522c7540445312604 (diff)
Cleanup: use time scrub instead of scrubbing
Renaming was only done to ED_time_scrub_ui.h, function names and struct members used term 'scrubbing' which is ambiguous.
Diffstat (limited to 'source/blender/editors/space_clip/space_clip.c')
-rw-r--r--source/blender/editors/space_clip/space_clip.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index 88c4c7735af..4df435270ce 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1007,8 +1007,8 @@ static void clip_preview_region_init(wmWindowManager *wm, ARegion *ar)
keymap = WM_keymap_ensure(wm->defaultconf, "Clip", SPACE_CLIP, 0);
WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap);
- keymap = WM_keymap_ensure(wm->defaultconf, "Clip Scrubbing", SPACE_CLIP, RGN_TYPE_PREVIEW);
- WM_event_add_keymap_handler_poll(&ar->handlers, keymap, ED_event_in_scrubbing_region);
+ keymap = WM_keymap_ensure(wm->defaultconf, "Clip Time Scrub", SPACE_CLIP, RGN_TYPE_PREVIEW);
+ WM_event_add_keymap_handler_poll(&ar->handlers, keymap, ED_time_scrub_event_in_region);
keymap = WM_keymap_ensure(wm->defaultconf, "Clip Graph Editor", SPACE_CLIP, 0);
WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap);
@@ -1048,7 +1048,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar)
UI_view2d_view_restore(C);
/* time-scrubbing */
- ED_scrubbing_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true);
+ ED_time_scrub_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true);
/* scrollers */
scrollers = UI_view2d_scrollers_calc(v2d, NULL);
@@ -1062,7 +1062,7 @@ static void graph_region_draw(const bContext *C, ARegion *ar)
0,
15 * UI_DPI_FAC,
15 * UI_DPI_FAC,
- UI_DPI_FAC * ar->sizey - UI_SCRUBBING_MARGIN_Y);
+ UI_DPI_FAC * ar->sizey - UI_TIME_SCRUB_MARGIN_Y);
UI_view2d_draw_scale_y__values(ar, v2d, &rect, TH_TEXT);
}
}
@@ -1102,7 +1102,7 @@ static void dopesheet_region_draw(const bContext *C, ARegion *ar)
UI_view2d_view_restore(C);
/* time-scrubbing */
- ED_scrubbing_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true);
+ ED_time_scrub_draw(ar, scene, sc->flag & SC_SHOW_SECONDS, true);
/* scrollers */
scrollers = UI_view2d_scrollers_calc(v2d, NULL);