[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22972] branches/blender2.5/blender/source /blender/blenloader/intern/readfile.c: 2.5: fix missing LIB_NEEDLINK check in windowmanager reading,

Brecht Van Lommel brecht at blender.org
Thu Sep 3 20:39:40 CEST 2009


Revision: 22972
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22972
Author:   blendix
Date:     2009-09-03 20:38:52 +0200 (Thu, 03 Sep 2009)

Log Message:
-----------
2.5: fix missing LIB_NEEDLINK check in windowmanager reading,
would cause crash with linking/appending.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-09-03 17:45:04 UTC (rev 22971)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-09-03 18:38:52 UTC (rev 22972)
@@ -4355,11 +4355,14 @@
 static void lib_link_windowmanager(FileData *fd, Main *main)
 {
 	wmWindowManager *wm;
+	wmWindow *win;
 	
 	for(wm= main->wm.first; wm; wm= wm->id.next) {
-		wmWindow *win;
-		for(win= wm->windows.first; win; win= win->next) {
-			win->screen= newlibadr(fd, NULL, win->screen);
+		if(wm->id.flag & LIB_NEEDLINK) {
+			for(win= wm->windows.first; win; win= win->next)
+				win->screen= newlibadr(fd, NULL, win->screen);
+
+			wm->id.flag -= LIB_NEEDLINK;
 		}
 	}
 }





More information about the Bf-blender-cvs mailing list