Sculpt Branch:
[blender-staging.git] / source / blender / blenloader / intern / readfile.c
index ec10d7d7ce2509ed94617416826c1b9170add714..3ab557fe0589688c8ee0f5434bdb74336106b777 100644 (file)
@@ -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 */