[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14419] trunk/blender/source/blender/ blenloader/intern/readfile.c:

[Brecht Van Lommel]

Revision: 14419
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14419
Author:   blendix
Date:     2008-04-14 15:09:08 +0200 (Mon, 14 Apr 2008)

Log Message:
-----------

Fix for bug #8957: undo lost scenes assigned to screens.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2008-04-14 10:14:59 UTC (rev 14418)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2008-04-14 13:09:08 UTC (rev 14419)
@@ -3843,7 +3843,9 @@
 
 	for(sc= newmain->screen.first; sc; sc= sc->id.next) {
 		
-		sc->scene= curscene;
+		sc->scene= restore_pointer_by_name(newmain, (ID *)sc->scene, 1);
+		if(sc->scene==NULL)
+			sc->scene= curscene;
 
 		sa= sc->areabase.first;
 		while(sa) {