diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-04-27 15:37:57 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-27 15:37:57 +0400 |
commit | db18b47be53d997e95f7f0d3ba796c0b1b4133b5 (patch) | |
tree | eaeeccc64c8cd523f2d5428646da992e608cc59f /source/blender/src/meshtools.c | |
parent | bc059cb8b2b8b09553e4d02b4bcccd67ff73d8fd (diff) |
fix for own error when trying to fix python command line crash,
was calling screenmain() before executing the python script which meant it was never executed (therefore no crash :) )
Moved screenmain() back to the the end of main() and added a TESTBASELIB_BGMODE which checks for G.vd and uses the scene layer if its not there. Of course python should not be running stuff that uses G.vd :/
Also made python scripts stay attached to screens when LOAD UI is disabled. This means you can load a new blend file and the python console can stay open, has been tested for a while in the apricot branch.
Diffstat (limited to 'source/blender/src/meshtools.c')
-rw-r--r-- | source/blender/src/meshtools.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c index 79b0d8fc1de..e27e772edee 100644 --- a/source/blender/src/meshtools.c +++ b/source/blender/src/meshtools.c @@ -164,7 +164,7 @@ int join_mesh(void) /* count & check */ base= FIRSTBASE; while(base) { - if TESTBASELIB(base) { + if TESTBASELIB_BGMODE(base) { /* BGMODE since python can access */ if(base->object->type==OB_MESH) { me= base->object->data; totvert+= me->totvert; @@ -200,7 +200,7 @@ int join_mesh(void) /* if needed add edges to other meshes */ for(base= FIRSTBASE; base; base= base->next) { - if TESTBASELIB(base) { + if TESTBASELIB_BGMODE(base) { if(base->object->type==OB_MESH) { me= base->object->data; totedge += me->totedge; @@ -221,7 +221,7 @@ int join_mesh(void) base= FIRSTBASE; while(base) { - if TESTBASELIB(base) { + if TESTBASELIB_BGMODE(base) { if(ob!=base->object && base->object->type==OB_MESH) { me= base->object->data; @@ -288,7 +288,7 @@ int join_mesh(void) base= FIRSTBASE; while(base) { nextb= base->next; - if TESTBASELIB(base) { + if TESTBASELIB_BGMODE(base) { if(base->object->type==OB_MESH) { me= base->object->data; |