diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-29 11:58:03 +0400 |
| commit | 24def76ac899e106b4a04364504ba0cbc100d7f7 (patch) | |
| tree | 150a4593cbd3054ab5f10df2ccda6a0fb0c82cd9 /source/blender/windowmanager | |
| parent | d55f6c64a24c9e8e46f2a7d33da17aff24ce6d1a (diff) | |
svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender .
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 7dd865984b3..e22829577f4 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -155,7 +155,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 */ |