diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-02-23 18:52:40 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-02-23 18:52:40 +0400 |
| commit | 5de307122c0a2a80fa3e253fe037497b02c2dd26 (patch) | |
| tree | 0061c32fc86606593a2336dc8b1aa50cb94636a0 /source/blender/blenloader | |
| parent | 89e0de3c355e3d44640d3180599611cbb88a8835 (diff) | |
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.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |