diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-14 09:38:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-14 09:38:06 +0300 |
| commit | b0fa10f8809a412aaf1136c97ac0eef30ec5e686 (patch) | |
| tree | 832b17131783730df650fb1d390e8653dac03b23 /source/blender/editors/screen | |
| parent | a09b8c08fced7f5e0d4c4e38357093c30785ed04 (diff) | |
| parent | 7cd9926fd876c457fce925f68e3d641015c2f978 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index fca2def644c..1f2d24a88f7 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1069,7 +1069,7 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) /* *********************************** */ /* case when on area-edge or in azones, or outside window */ -static void screen_cursor_set(wmWindow *win, wmEvent *event) +static void screen_cursor_set(wmWindow *win, const wmEvent *event) { const bScreen *screen = WM_window_get_active_screen(win); const int winsize_x = WM_window_pixels_x(win); @@ -1109,7 +1109,7 @@ static void screen_cursor_set(wmWindow *win, wmEvent *event) /* called in wm_event_system.c. sets state vars in screen, cursors */ /* event type is mouse move */ -void ED_screen_set_subwinactive(bContext *C, wmEvent *event) +void ED_screen_set_subwinactive(bContext *C, const wmEvent *event) { wmWindow *win = CTX_wm_window(C); bScreen *scr = WM_window_get_active_screen(win); |