[Bf-blender-cvs] [b0fa10f8809] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: b0fa10f8809a412aaf1136c97ac0eef30ec5e686
Author: Campbell Barton
Date:   Sat Oct 14 17:38:06 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBb0fa10f8809a412aaf1136c97ac0eef30ec5e686

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/include/ED_screen.h
index 7ebf0e921ac,4253e214537..f650ae879a5
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -109,9 -101,13 +109,9 @@@ void    ED_screens_initialize(struct wm
  void    ED_screen_draw(struct wmWindow *win);
  void    ED_screen_refresh(struct wmWindowManager *wm, struct wmWindow *win);
  void    ED_screen_do_listen(struct bContext *C, struct wmNotifier *note);
 -bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);
 -bScreen *ED_screen_add(struct wmWindow *win, struct Scene *scene, const char *name);
 -bool    ED_screen_set(struct bContext *C, struct bScreen *sc);
 -bool    ED_screen_delete(struct bContext *C, struct bScreen *sc);
 -void    ED_screen_set_scene(struct bContext *C, struct bScreen *screen, struct Scene *scene);
 -bool    ED_screen_delete_scene(struct bContext *C, struct Scene *scene);
 +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);
diff --cc source/blender/editors/screen/screen_edit.c
index fca2def644c,8f1132dc1e5..1f2d24a88f7
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@@ -1069,9 -1363,8 +1069,9 @@@ void ED_screen_exit(bContext *C, wmWind
  /* *********************************** */
  
  /* 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);
  	const int winsize_y = WM_window_pixels_y(win);
  
@@@ -1109,12 -1402,12 +1109,12 @@@
  
  /* 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);
 -	
 -	if (win->screen) {
 -		bScreen *scr = win->screen;
 +	bScreen *scr = WM_window_get_active_screen(win);
 +
 +	if (scr) {
  		ScrArea *sa;
  		ARegion *ar;
  		int oldswin = scr->subwinactive;