Fix for two proxy + undo related crashes:
[blender.git] / source / blender / blenloader / intern / readblenentry.c
index 5a75b5c8b110426dd5dcaac269dde28a6d1c51c3..e4bc6e3abb208b8e07ce0a82dee5bbbccc0ebaac 100644 (file)
@@ -364,6 +364,9 @@ BlendFileData *BLO_read_from_memfile(const char *filename, MemFile *memfile, Ble
        if (fd) {
                strcpy(fd->filename, filename);
                
+               /* clear ob->proxy_from pointers in G.main */
+               blo_clear_proxy_pointers_from_lib(fd);
+
                /* separate libraries from G.main */
                blo_split_main(&mainlist, G.main);
                /* add the library pointers in oldmap lookup */