diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-10 18:32:03 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-08-10 18:32:03 +0400 |
| commit | 465c3b82fa8320c0366eaa72b2319c8b42f9c8f1 (patch) | |
| tree | 9d458a8e0fdd9f12f3cb03eeeab246ca2523a707 /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 16deef9e79721d3525244eaef11190b5ff0fd58b (diff) | |
| parent | 22694c993a7e32767db4719e9fa37e93445b66a8 (diff) | |
merge with trunk r39216
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index daaaee771fd..52a80ffa92b 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -163,7 +163,8 @@ void WM_init(bContext *C, int argc, const char **argv) BPY_python_start(argc, argv); BPY_driver_reset(); - BPY_app_handlers_reset(); + BPY_app_handlers_reset(); /* causes addon callbacks to be freed [#28068], + * but this is actually what we want. */ BPY_modules_load_user(C); #else (void)argc; /* unused */ @@ -190,8 +191,6 @@ void WM_init(bContext *C, int argc, const char **argv) ED_preview_init_dbase(); - G.ndofdevice = -1; /* XXX bad initializer, needs set otherwise buttons show! */ - WM_read_history(); /* allow a path of "", this is what happens when making a new file */ |