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/include/ED_screen.h | |
| parent | a09b8c08fced7f5e0d4c4e38357093c30785ed04 (diff) | |
| parent | 7cd9926fd876c457fce925f68e3d641015c2f978 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/include/ED_screen.h')
| -rw-r--r-- | source/blender/editors/include/ED_screen.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h index 7ebf0e921ac..f650ae879a5 100644 --- a/source/blender/editors/include/ED_screen.h +++ b/source/blender/editors/include/ED_screen.h @@ -111,7 +111,7 @@ void ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win); void ED_screen_do_listen(struct bContext *C, struct wmNotifier *note); bool ED_screen_change(struct bContext *C, struct bScreen *sc); void ED_screen_update_after_scene_change(const struct bScreen *screen, struct Scene *scene_new); -void ED_screen_set_subwinactive(struct bContext *C, struct wmEvent *event); +void ED_screen_set_subwinactive(struct bContext *C, const struct wmEvent *event); void ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen); void ED_screen_animation_timer(struct bContext *C, int redraws, int refresh, int sync, int enable); void ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh); |