diff options
author | Campbell Barton <ideasman42@gmail.com> | 2006-03-24 19:04:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2006-03-24 19:04:55 +0300 |
commit | 21c9ee54cadd76643bbf9dcaf47e97c2a30a92cb (patch) | |
tree | 95970eaadbb4e7d226e99abc1246de3f6ea0a7b2 | |
parent | d29503cc6d96cabe836c011645cde9920ba213b8 (diff) |
blender -P xxx -b crashed sometimes, still will crash in some cases if the python functions access screen data. but at least Blender.sys.expandpath wont segfault anymore.
-rw-r--r-- | source/blender/python/api2_2x/Blender.c | 3 | ||||
-rw-r--r-- | source/blender/src/drawscene.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c index 46cb3381e38..d67d05eaea0 100644 --- a/source/blender/python/api2_2x/Blender.c +++ b/source/blender/python/api2_2x/Blender.c @@ -817,7 +817,8 @@ void M_Blender_Init(void) G.scene is NULL */ if(G.background && G.main->scene.first==0) { Scene *sce= add_scene("1"); - set_scene(sce); + //set_scene(sce); /* causes a crash */ + G.scene= sce; } module = Py_InitModule3("Blender", Blender_methods, diff --git a/source/blender/src/drawscene.c b/source/blender/src/drawscene.c index 330f9d45085..4528c2125f4 100644 --- a/source/blender/src/drawscene.c +++ b/source/blender/src/drawscene.c @@ -134,10 +134,8 @@ void set_scene(Scene *sce) /* also see scene.c: set_scene_bg() */ set_radglobal(); /* complete redraw */ - if (!G.background) { - allqueue(REDRAWALL, 0); - allqueue(REDRAWDATASELECT, 0); /* does a remake */ - } + allqueue(REDRAWALL, 0); + allqueue(REDRAWDATASELECT, 0); /* does a remake */ } |