diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-08-07 16:39:32 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-08-07 16:39:32 +0300 |
commit | 9becee445ee525a7831e28567f041b4477d0c9ba (patch) | |
tree | f12d51ef9a70497903358923aa7be44009598d80 /source/blender/editors/space_graph | |
parent | 20bd253809ff5e45270212d0afb2c68fd346944e (diff) |
Fix scrubbing only treated as animation for sequencer
Intent was to act as animation everywhere
Diffstat (limited to 'source/blender/editors/space_graph')
-rw-r--r-- | source/blender/editors/space_graph/graph_ops.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 93773a17878..8e5c85d2c38 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -139,7 +139,7 @@ static void graphview_cursor_setprops(bContext *C, wmOperator *op, const wmEvent /* Modal Operator init */ static int graphview_cursor_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - wmWindow *win = CTX_wm_window(C); + bScreen *screen = CTX_wm_screen(C); /* Change to frame that mouse is over before adding modal handler, * as user could click on a single frame (jump to frame) as well as * click-dragging over a range (modal scrubbing). @@ -149,8 +149,8 @@ static int graphview_cursor_invoke(bContext *C, wmOperator *op, const wmEvent *e /* apply these changes first */ graphview_cursor_apply(C, op); - if (win->screen) - win->screen->scrubbing = true; + if (screen) + screen->scrubbing = true; /* add temp handler */ WM_event_add_modal_handler(C, op); @@ -160,12 +160,12 @@ static int graphview_cursor_invoke(bContext *C, wmOperator *op, const wmEvent *e /* Modal event handling of cursor changing */ static int graphview_cursor_modal(bContext *C, wmOperator *op, const wmEvent *event) { - wmWindow *win = CTX_wm_window(C); + bScreen *screen = CTX_wm_screen(C); /* execute the events */ switch (event->type) { case ESCKEY: - if (win->screen) - win->screen->scrubbing = false; + if (screen) + screen->scrubbing = false; return OPERATOR_FINISHED; case MOUSEMOVE: @@ -181,8 +181,8 @@ static int graphview_cursor_modal(bContext *C, wmOperator *op, const wmEvent *ev * the modal op) doesn't work for some reason */ if (event->val == KM_RELEASE) { - if (win->screen) - win->screen->scrubbing = false; + if (screen) + screen->scrubbing = false; return OPERATOR_FINISHED; } break; |