[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47109] trunk/blender/source/blender/ blenloader/intern/readfile.c: Fixed crash opening files with missed libraries.

[Sergey Sharybin]

Revision: 47109
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47109
Author:   nazgul
Date:     2012-05-28 10:32:38 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Fixed crash opening files with missed libraries.

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	2012-05-28 09:53:59 UTC (rev 47108)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-05-28 10:32:38 UTC (rev 47109)
@@ -9002,12 +9002,6 @@
 					
 					fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
 
-					/* share the mainlist, so all libraries are added immediately in a
-					 * single list. it used to be that all FileData's had their own list,
-					 * but with indirectly linking this meant we didn't catch duplicate
-					 * libraries properly */
-					fd->mainlist = mainlist;
-					
 					/* allow typing in a new lib path */
 					if (G.rt == -666) {
 						while (fd == NULL) {
@@ -9034,6 +9028,12 @@
 					}
 					
 					if (fd) {
+						/* share the mainlist, so all libraries are added immediately in a
+						 * single list. it used to be that all FileData's had their own list,
+						 * but with indirectly linking this meant we didn't catch duplicate
+						 * libraries properly */
+						fd->mainlist = mainlist;
+
 						fd->reports = basefd->reports;
 						
 						if (fd->libmap)