diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index b2cdddf5b63..b4328d12e81 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -78,7 +78,7 @@ #include "ED_armature.h" #include "ED_keyframing.h" #include "ED_node.h" -#include "ED_previewrender.h" +#include "ED_render.h" #include "ED_space_api.h" #include "ED_screen.h" #include "ED_util.h" @@ -90,6 +90,7 @@ #include "GPU_extensions.h" #include "GPU_draw.h" +#include "BKE_depsgraph.h" #include "BKE_sound.h" static void wm_init_reports(bContext *C) @@ -113,6 +114,7 @@ void WM_init(bContext *C) set_free_windowmanager_cb(wm_close_and_free); /* library.c */ set_blender_test_break_cb(wm_window_testbreak); /* blender.c */ + DAG_editors_update_cb(ED_render_id_flush_update); /* depsgraph.c */ ED_spacetypes_init(); /* editors/space_api/spacetype.c */ @@ -129,6 +131,8 @@ void WM_init(bContext *C) wm_init_reports(C); /* reports cant be initialized before the wm */ + GPU_extensions_init(); + UI_init(); // clear_matcopybuf(); /* XXX */ @@ -139,8 +143,6 @@ void WM_init(bContext *C) ED_preview_init_dbase(); - GPU_extensions_init(); - G.ndofdevice = -1; /* XXX bad initializer, needs set otherwise buttons show! */ read_Blog(); @@ -167,6 +169,7 @@ extern wchar_t *copybufinfo; // XXX copy/paste buffer stuff... extern void free_anim_copybuf(); +extern void free_anim_drivers_copybuf(); extern void free_posebuf(); /* called in creator.c even... tsk, split this! */ @@ -187,6 +190,7 @@ void WM_exit(bContext *C) CTX_wm_window_set(C, win); /* needed by operator close callbacks */ WM_event_remove_handlers(C, &win->handlers); + WM_event_remove_handlers(C, &win->modalhandlers); ED_screen_exit(C, win, win->screen); } } @@ -213,6 +217,7 @@ void WM_exit(bContext *C) free_blender(); /* blender.c, does entire library and spacetypes */ // free_matcopybuf(); free_anim_copybuf(); + free_anim_drivers_copybuf(); free_posebuf(); // free_vertexpaint(); // free_imagepaint(); |