Merge branch 'master' into blender2.8

2017-08-25 20:45:16 +10:00
parent 0e29a97813 16377abda8
commit f8f6f8f26e
7 changed files with 66 additions and 43 deletions
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -88,7 +88,8 @@ void        wm_event_do_handlers    (bContext *C);

 void        wm_event_add_ghostevent (wmWindowManager *wm, wmWindow *win, int type, int time, void *customdata);

-void        wm_event_do_notifiers   (bContext *C);
+void        wm_event_do_refresh_wm_and_depsgraph(bContext *C);
+void        wm_event_do_notifiers(bContext *C);

 /* wm_keymap.c */