griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for another deadlock with py-drivers: BlendData.scene.remove()

Browse Source
This commit is contained in:
Campbell Barton
2014-02-17 19:29:37 +11:00
parent 8afd646b18
commit 14b9c79483
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/makesrna/intern/rna_main_api.c
View File

@@ -104,6 +104,10 @@
#include "BLF_translation.h"
#ifdef WITH_PYTHON
# include "BPY_extern.h"
#endif
static Camera *rna_Main_cameras_new(Main *bmain, const char *name)
{
ID *id = BKE_camera_add(bmain, name);
@@ -138,7 +142,17 @@ static void rna_Main_scenes_remove(Main *bmain, bContext *C, ReportList *reports
{
bScreen *sc = CTX_wm_screen(C);
if (sc->scene == scene) {
#ifdef WITH_PYTHON
BPy_BEGIN_ALLOW_THREADS;
#endif
ED_screen_set_scene(C, sc, scene_new);
#ifdef WITH_PYTHON
BPy_END_ALLOW_THREADS;
#endif
}
BKE_scene_unlink(bmain, scene, scene_new);

4
source/blender/makesrna/intern/rna_screen.c
View File

@@ -81,13 +81,13 @@ static void rna_Screen_scene_update(bContext *C, PointerRNA *ptr)
/* exception: must use context so notifier gets to the right window */
if (sc->newscene) {
#ifdef WITH_PYTHON
BPy_BEGIN_ALLOW_THREADS;
BPy_BEGIN_ALLOW_THREADS;
#endif
ED_screen_set_scene(C, sc, sc->newscene);
#ifdef WITH_PYTHON
BPy_END_ALLOW_THREADS;
BPy_END_ALLOW_THREADS;
#endif
WM_event_add_notifier(C, NC_SCENE | ND_SCENEBROWSE, sc->newscene);