blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix T38541: sys.exit fails when blender is built as a py-module

This commit is contained in:
Campbell Barton 2014-02-13 06:53:42 +11:00
parent 70905a6e02
commit a397009181
Notes: blender-bot 2023-02-14 20:10:54 +01:00 
Referenced by issue blender/blender-addons#38541, When built as a Python module, Blender overwrites sys.exit() codes with its own exit code
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/python/intern/bpy_interface.c
View File

@ -361,8 +361,10 @@ void BPY_python_start(int argc, const char **argv)
void BPY_python_end(void)
{
// fprintf(stderr, "Ending Python!\n");
PyGILState_STATE gilstate;
PyGILState_Ensure(); /* finalizing, no need to grab the state */
/* finalizing, no need to grab the state, except when we are a module */
gilstate = PyGILState_Ensure();
/* free other python data. */
pyrna_free_types();
@ -373,10 +375,12 @@ void BPY_python_end(void)
#ifndef WITH_PYTHON_MODULE
BPY_atexit_unregister(); /* without this we get recursive calls to WM_exit */
#endif
Py_Finalize();
#else
PyGILState_Release(gilstate);
#endif
#ifdef TIME_PY_RUN
/* measure time since py started */
bpy_timer = PIL_check_seconds_timer() - bpy_timer;

21
source/blender/windowmanager/intern/wm_init_exit.c
View File

@ -522,20 +522,21 @@ void WM_exit_ext(bContext *C, const bool do_python)
MEM_printmemlist();
}
wm_autosave_delete();
printf("\nBlender quit\n");
#ifdef WIN32
/* ask user to press a key when in debug mode */
if (G.debug & G_DEBUG) {
printf("Press any key to exit . . .\n\n");
wait_for_console_key();
}
#endif
}
void WM_exit(bContext *C)
{
WM_exit_ext(C, 1);
printf("\nBlender quit\n");
#ifdef WIN32
/* ask user to press a key when in debug mode */
if (G.debug & G_DEBUG) {
printf("Press any key to exit . . .\n\n");
wait_for_console_key();
}
#endif
exit(G.is_break == TRUE);
}

2
source/creator/creator.c
View File

@ -1746,7 +1746,7 @@ int main(int argc, const char **argv)
#ifdef WITH_PYTHON_MODULE
void main_python_exit(void)
{
WM_exit((bContext *)evil_C);
WM_exit_ext((bContext *)evil_C, true);
evil_C = NULL;
}
#endif