Merge from trunk

revs. 15635:15771
2008-07-26 10:45:11 +00:00
parent 4c6e0d49c8
commit 4a8aa06a14
136 changed files with 6316 additions and 1076 deletions
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -708,7 +708,7 @@ static PyObject *Blender_Save( PyObject * self, PyObject * args )
 					      "expected filename and optional int (overwrite flag) as arguments" );

 	for( li = G.main->library.first; li; li = li->id.next ) {
-		if( BLI_streq( li->name, fname ) ) {
+		if( li->parent==NULL && BLI_streq( li->name, fname ) ) {
 			return EXPP_ReturnPyObjError( PyExc_AttributeError,
 						      "cannot overwrite used library" );
 		}