Sculpt Branch:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25180:25245

2 files changed, 17 insertions, 0 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index ec10d7d7ce2..3ab557fe058 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4232,6 +4232,9 @@ static void lib_link_scene(FileData *fd, Main *main)
 				seq->anim= 0;
 			}
 			SEQ_END
+
+			if(sce->ed)
+				seq_update_muting(sce->ed);
 			
 			if(sce->nodetree) {
 				lib_link_ntree(fd, &sce->id, sce->nodetree);
@@ -10164,6 +10167,14 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				}
 			}
 		}
+		/* clear hanging 'temp' screens from older 2.5 files*/
+		if (main->versionfile == 250) {
+			bScreen *screen;
+			for(screen= main->screen.first; screen; screen= screen->id.next) {
+				if (screen->full == SCREENTEMP)
+					free_libblock(&main->screen, screen);
+			}
+		}
 	}
 	
 	/* put 2.50 compatibility code here until next subversion bump */
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index c432dfd746f..bc0db6d4cd1 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -934,8 +934,14 @@ static void write_fcurves(WriteData *wd, ListBase *fcurves)
 			ChannelDriver *driver= fcu->driver;
 			DriverTarget *dtar;
 			
+			/* don't save compiled python bytecode */
+			void *expr_comp= driver->expr_comp;
+			driver->expr_comp= NULL;
+
 			writestruct(wd, DATA, "ChannelDriver", 1, driver);
 			
+			driver->expr_comp= expr_comp; /* restore */
+
 			/* targets */
 			for (dtar= driver->targets.first; dtar; dtar= dtar->next) {
 				writestruct(wd, DATA, "DriverTarget", 1, dtar);