From 5de307122c0a2a80fa3e253fe037497b02c2dd26 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sat, 23 Feb 2013 14:52:40 +0000 Subject: Bug fix in 2.66 release, irc submitted. File with packed images crashes on load. Do-versions now is copying Images, because texture "use alpha" has been removed... However, it then also copied packaged images, which crashes for some reason. For now I skip packed image copy, which keeps blender work. This versioning code needs more checking though. --- source/blender/blenloader/intern/readfile.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4bae406fd09..1aedfb329e4 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -8714,7 +8714,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (image == blo_do_versions_newlibadr(fd, otex->id.lib, otex->ima)) break; - if (otex) { + /* no duplication for packed files */ + if (otex && image->packedfile == NULL) { /* copy image datablock */ nimage = BKE_image_copy(main, image); nimage->flag |= IMA_IGNORE_ALPHA|IMA_DONE_TAG; -- cgit v1.2.3