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/creator | |
| 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/creator')
| -rw-r--r-- | source/creator/creator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index e91705345c6..2fd3a482a27 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -263,8 +263,6 @@ static void main_init_screen( void ) if(G.main->scene.first==0) { set_scene( add_scene("1") ); } - - screenmain(); } int main(int argc, char **argv) @@ -815,6 +813,8 @@ int main(int argc, char **argv) if (scr_init==0) { main_init_screen(); } + + screenmain(); /* main display loop */ return 0; } /* end of int main(argc,argv) */ |