forked from bartvdbraak/blender
fix for segfault with bpy compiled as python module (dont register atexit)
update `make lite` built target to remove some newly added features.
This commit is contained in:
parent
25e3b647b1
commit
af6f753400
@ -15,6 +15,7 @@ set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)
|
||||
set(WITH_CYCLES OFF CACHE FORCE BOOL)
|
||||
set(WITH_FFTW3 OFF CACHE FORCE BOOL)
|
||||
set(WITH_LIBMV OFF CACHE FORCE BOOL)
|
||||
set(WITH_CARVE OFF CACHE FORCE BOOL)
|
||||
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
|
||||
set(WITH_IK_ITASC OFF CACHE FORCE BOOL)
|
||||
set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL)
|
||||
@ -33,6 +34,7 @@ set(WITH_LZO OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_BOOLEAN OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_FLUID OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_REMESH OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL)
|
||||
set(WITH_MOD_OCEANSIM OFF CACHE FORCE BOOL)
|
||||
set(WITH_AUDASPACE OFF CACHE FORCE BOOL)
|
||||
@ -43,3 +45,4 @@ set(WITH_PYTHON_INSTALL OFF CACHE FORCE BOOL)
|
||||
set(WITH_RAYOPTIMIZATION OFF CACHE FORCE BOOL)
|
||||
set(WITH_SDL OFF CACHE FORCE BOOL)
|
||||
set(WITH_X11_XINPUT OFF CACHE FORCE BOOL)
|
||||
set(WITH_X11_XF86VMODE OFF CACHE FORCE BOOL)
|
||||
|
@ -267,9 +267,10 @@ void BPY_python_start(int argc, const char **argv)
|
||||
|
||||
pyrna_alloc_types();
|
||||
|
||||
#ifndef WITH_PYTHON_MODULE
|
||||
/* py module runs atexit when bpy is freed */
|
||||
BPY_atexit_register(); /* this can init any time */
|
||||
|
||||
#ifndef WITH_PYTHON_MODULE
|
||||
py_tstate = PyGILState_GetThisThreadState();
|
||||
PyEval_ReleaseThread(py_tstate);
|
||||
#endif
|
||||
@ -288,7 +289,9 @@ void BPY_python_end(void)
|
||||
|
||||
bpy_intern_string_exit();
|
||||
|
||||
#ifndef WITH_PYTHON_MODULE
|
||||
BPY_atexit_unregister(); /* without this we get recursive calls to WM_exit */
|
||||
#endif
|
||||
|
||||
Py_Finalize();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user