- Py_BEGIN_ALLOW_THREADS and Py_END_ALLOW_THREADS macros cannot be used here, because the Py_BEGIN_ALLOW_THREADS causes a crash when quitting Blender.
- The low level function PyEval_ReleaseLock() is used assuming the Python library was built with multi-threads support.
view3d_intern.h
)
+if(WITH_PYTHON)
+ blender_include_dirs(../../python)
+ add_definitions(-DWITH_PYTHON)
+endif()
+
if(WITH_GAMEENGINE)
list(APPEND INC
../../../gameengine/BlenderRoutines
'../../windowmanager',
]
+if env['WITH_BF_PYTHON']:
+ incs.append('../../python')
+ defs.append('WITH_PYTHON')
+
if env['WITH_BF_GAMEENGINE']:
defs.append('WITH_GAMEENGINE')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
#include "UI_resources.h"
+#ifdef WITH_PYTHON
+# include "BPY_extern.h"
+#endif
+
#include "view3d_intern.h" /* own include */
/* ******************** manage regions ********************* */
RegionView3D *rv3d = ar->regiondata;
if (rv3d->render_engine) {
+#ifdef WITH_PYTHON
+ BPy_BEGIN_ALLOW_THREADS;
+#endif
+
WM_jobs_kill_type(wm, ar, WM_JOB_TYPE_RENDER_PREVIEW);
+
+#ifdef WITH_PYTHON
+ BPy_END_ALLOW_THREADS;
+#endif
+
if (rv3d->render_engine->re)
RE_Database_Free(rv3d->render_engine->re);
RE_engine_free(rv3d->render_engine);
void BPY_python_end(void);
void BPY_python_reset(struct bContext *C);
+
+/* global interpreter lock */
+
+typedef void *BPy_ThreadStatePtr;
+
+BPy_ThreadStatePtr BPY_thread_save(void);
+void BPY_thread_restore(BPy_ThreadStatePtr tstate);
+
+/* our own wrappers to Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS */
+#define BPy_BEGIN_ALLOW_THREADS { BPy_ThreadStatePtr _bpy_saved_tstate = BPY_thread_save(); (void)0
+#define BPy_END_ALLOW_THREADS BPY_thread_restore(_bpy_saved_tstate); } (void)0
+
+
/* 2.5 UI Scripts */
int BPY_filepath_exec(struct bContext *C, const char *filepath, struct ReportList *reports);
int BPY_text_exec(struct bContext *C, struct Text *text, struct ReportList *reports, const bool do_jump);
BPY_modules_load_user(C);
}
+/* wrapper functions related to global interpreter lock. these functions
+ * are slightly different from the original Python API, don't throw
+ * SIGABRT even if the thread state is NULL. */
+
+/* analogue of PyEval_SaveThread() */
+BPy_ThreadStatePtr BPY_thread_save(void)
+{
+ PyThreadState *tstate = PyThreadState_Swap(NULL);
+ /* note: tstate can be NULL when quitting Blender */
+
+ if (tstate && PyEval_ThreadsInitialized()) {
+ PyEval_ReleaseLock();
+ }
+
+ return (BPy_ThreadStatePtr)tstate;
+}
+
+/* analogue of PyEval_RestoreThread() */
+void BPY_thread_restore(BPy_ThreadStatePtr tstate)
+{
+ if (tstate) {
+ PyEval_RestoreThread((PyThreadState *)tstate);
+ }
+}
+
static void python_script_error_jump_text(struct Text *text)
{
int lineno;