archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.4x fix for Blender.Load()

Browse Source 
only bother checking script spaces when loading a blend file

Should be able to load a STL or DXF when script spaces are open now
This commit is contained in:
Campbell Barton
2009-11-10 15:34:27 +00:00
parent 624d26e0a8
commit bc3eff97c4
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/python/api2_2x/Blender.c
View File

@@ -626,13 +626,6 @@ static PyObject *Blender_Load( PyObject * self, PyObject * args )
BLI_strncpy( name, G.sce, FILE_MAXDIR ); BLI_strncpy( name, G.sce, FILE_MAXDIR );
} }
/* We won't let a new .blend file be loaded if there are still other
* scripts running, since loading a new file will close and remove them. */
if( G.main->script.first != G.main->script.last )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"there are other scripts running at the Scripts win, close them first!" );
if( fname ) { if( fname ) {
file = open( fname, O_BINARY | O_RDONLY ); file = open( fname, O_BINARY | O_RDONLY );
@@ -652,6 +645,14 @@ static PyObject *Blender_Load( PyObject * self, PyObject * args )
if( is_blend_file ) { if( is_blend_file ) {
int during_slink = during_scriptlink( ); int during_slink = during_scriptlink( );
/* We won't let a new .blend file be loaded if there are still other
* scripts running, since loading a new file will close and remove them. */
if( G.main->script.first != G.main->script.last )
return EXPP_ReturnPyObjError( PyExc_RuntimeError,
"there are other scripts running at the Scripts win, close them first!" );
/* when loading a .blend file from a scriptlink, the scriptlink pointer /* when loading a .blend file from a scriptlink, the scriptlink pointer
* in BPY_do_pyscript becomes invalid during a loop. Inform it here. * in BPY_do_pyscript becomes invalid during a loop. Inform it here.