Blender Git Loki
Git Commits -> Revision 1fc6563
Revision 1fc6563 by Bastien Montagne (master) June 1, 2015, 11:12 (GMT) |
Fix T44894: Round two. We cannot `direct_link_packedfile()` twice on a same address, because this tries to map again pf->data address, which leads to nothing (NULL). So now, since `ima->packedfile` and `ima->packedfiles` are mutually exclusive in 'live' blender data anyway, we either read one or the other. Tested from/to official 2.74 and current master, everything looks fine now. |
Commit Details:
Full Hash: 1fc656391751a87a25b915f9841236cb9ba57cee
Parent Commit: c8711b6
Lines Changed: +9, -4
1 Modified Path:
/source/blender/blenloader/intern/readfile.c (+9, -4) (Diff)