fix for segfault with bpy compiled as python module (dont register atexit)
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 15:19:11 +0000 (15:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jan 2012 15:19:11 +0000 (15:19 +0000)
update `make lite` built target to remove some newly added features.

build_files/cmake/config/blender_lite.cmake
source/blender/python/intern/bpy_interface.c

index 26fa7623f2167c4ffae41a29b01d6e99d223a277..e72a0fff355f08143dc8191a4dd59077145204f6 100644 (file)
@@ -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)
index 6c961d8e6a8ed4e4858ae89f16bc84d139ebe61a..72c072c13d52d1aa50a9ebbe824e4ccc4c93fb07 100644 (file)
@@ -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();