Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Oct 2017 06:38:06 +0000 (17:38 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Oct 2017 06:38:06 +0000 (17:38 +1100)
1  2 
source/blender/editors/include/ED_screen.h
source/blender/editors/interface/interface_panel.c
source/blender/editors/object/object_add.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/transform/transform_ops.c
source/blender/windowmanager/intern/wm_dragdrop.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/wm.h
source/blender/windowmanager/wm_event_system.h

index 7ebf0e921aca15f4c5e20c3da2dd3719c5aa92b8,4253e214537d1270e27158d0fe064ff0f4d0de44..f650ae879a56dbc04e219e821bcfc2cbb46888e7
@@@ -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);
index fca2def644ca823ddaf93571656bd7a940c807db,8f1132dc1e57cf2a0342206be0ff7e6877ad9f17..1f2d24a88f74b59719d1524234b50e5c0c46d9d5
@@@ -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);
  
  
  /* 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;
Simple merge