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/blenkernel/intern/image.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/blenkernel/intern/image.c')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 3f885017f95..459e705eccc 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -246,7 +246,6 @@ static void image_free_buffers(Image *ima) /* called by library too, do not free ima itself */ void free_image(Image *ima) { - image_free_buffers(ima); if (ima->packedfile) { freePackedFile(ima->packedfile); @@ -257,7 +256,6 @@ void free_image(Image *ima) if (ima->preview) { BKE_previewimg_free(&ima->preview); } - } /* only image block itself */ |