kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixed crash opening files with missed libraries.

Browse Source
This commit is contained in:
Sergey Sharybin 2012-05-28 10:32:38 +00:00
parent 04c30c5efb
commit e442adf9cf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenloader/intern/readfile.c
View File

@ -9002,12 +9002,6 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
fd = blo_openblenderfile(mainptr->curlib->filepath, basefd->reports); 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 */ /* allow typing in a new lib path */
if (G.rt == -666) { if (G.rt == -666) {
while (fd == NULL) { while (fd == NULL) {
@ -9034,6 +9028,12 @@ static void read_libraries(FileData *basefd, ListBase *mainlist)
} }
if (fd) { 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; fd->reports = basefd->reports;
if (fd->libmap) if (fd->libmap)