diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-12-19 19:13:39 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-12-19 19:13:39 +0300 |
| commit | ec835f3d1022da91a5201654a0c0cde794f4b5b0 (patch) | |
| tree | db4bd195f35b651cc53cac43a068299e4517cb07 /source/blender/blenloader | |
| parent | 20eccd99ab8a5cd7dc645782e95867efe51c8be7 (diff) | |
Updated the "multiple library" fixing... it will now also pop up a
menu to warn user that the file needs a saveover to get the fix
permanent.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 54a7327949b..ffa15790d95 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3119,10 +3119,13 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) if(strcmp(newmain->curlib->name, lib->name)==0) { printf("Fixed error in file; multiple instances of lib:\n %s\n", lib->name); - change_idid_adr_fd(fd, lib, newmain->curlib); + change_idid_adr(&fd->mainlist, fd, lib, newmain->curlib); +// change_idid_adr_fd(fd, lib, newmain->curlib); BLI_remlink(&main->library, lib); MEM_freeN(lib); + + error("Library had multiple instances, save and reload!"); return; } } |