diff options
| author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2013-12-17 11:44:56 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-17 11:44:56 +0400 |
| commit | 5036ac6903da222c68aac76bee49006d7e6724c1 (patch) | |
| tree | 5b5ea301318f47af1d049ee8347eb71407bb6226 /source/blender/editors/space_view3d | |
| parent | f1a989f9c35d496842b2cfa44d90ee0019c06e22 (diff) | |
Partial fix for T37604: Deadlock when stopping rendered viewport (Blender Internal)
- 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.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 13 |
3 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 51477ec2ae7..97c328dbac2 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -64,6 +64,11 @@ set(SRC view3d_intern.h ) +if(WITH_PYTHON) + blender_include_dirs(../../python) + add_definitions(-DWITH_PYTHON) +endif() + if(WITH_GAMEENGINE) list(APPEND INC ../../../gameengine/BlenderRoutines diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index e73aa2db49e..e6658ab3c49 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -48,6 +48,10 @@ incs = [ '../../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'): diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 3f7d599f5d5..03b89972e55 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -69,6 +69,10 @@ #include "UI_resources.h" +#ifdef WITH_PYTHON +# include "BPY_extern.h" +#endif + #include "view3d_intern.h" /* own include */ /* ******************** manage regions ********************* */ @@ -266,7 +270,16 @@ static void view3d_stop_render_preview(wmWindowManager *wm, ARegion *ar) 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); |