diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-10 03:31:53 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-10 03:31:53 +0400 |
commit | e7a487d1e9e79176a0ca99cda3882aac4ea16a99 (patch) | |
tree | 2d624a11f3954033cfe7c2f4c51142701a8d586b /source/blender/windowmanager | |
parent | e70476db4b63f1720f24ff93aa15441de7740fd6 (diff) |
code cleanup: group python reset functions in BPY_python_reset()
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 5 |
2 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 7a528e41995..c372e2d1ce6 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -437,9 +437,7 @@ void WM_file_read(bContext *C, const char *filepath, ReportList *reports) #ifdef WITH_PYTHON /* run any texts that were loaded in and flagged as modules */ - BPY_driver_reset(); - BPY_app_handlers_reset(FALSE); - BPY_modules_load_user(C); + BPY_python_reset(C); #endif /* important to do before NULL'ing the context */ @@ -590,9 +588,7 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory /* sync addons, these may have changed from the defaults */ BPY_string_exec(C, "__import__('addon_utils').reset_all()"); - BPY_driver_reset(); - BPY_app_handlers_reset(FALSE); - BPY_modules_load_user(C); + BPY_python_reset(C); } #endif diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 31f2b412a7f..8115779a7c6 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -174,10 +174,7 @@ void WM_init(bContext *C, int argc, const char **argv) BPY_context_set(C); /* necessary evil */ BPY_python_start(argc, argv); - BPY_driver_reset(); - BPY_app_handlers_reset(FALSE); /* causes addon callbacks to be freed [#28068], - * but this is actually what we want. */ - BPY_modules_load_user(C); + BPY_python_reset(C); #else (void)argc; /* unused */ (void)argv; /* unused */ |