diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-07 20:36:49 +0400 |
| commit | edec46b0a6aac18f406991b9e16228d4bd848c61 (patch) | |
| tree | 1240768d737c63705fdb38c9832d926ed0bcda94 /source/blender/blenloader/intern/readblenentry.c | |
| parent | 2ed6f077b3952123d56916980d18a379ecb3e5ac (diff) | |
| parent | 4d7a9e5c055fd3903162b61fdd40fb77b2b96793 (diff) | |
Merge with trunk r41625
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
| -rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index 3f08e2301a7..6e4dcb66bfb 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -301,11 +301,17 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, const char *filename, MemFil /* makes lookup of existing images in old main */ blo_make_image_pointer_map(fd, oldmain); + /* makes lookup of existing video clips in old main */ + blo_make_movieclip_pointer_map(fd, oldmain); + bfd= blo_read_file_internal(fd, filename); /* ensures relinked images are not freed */ blo_end_image_pointer_map(fd, oldmain); + /* ensures relinked movie clips are not freed */ + blo_end_movieclip_pointer_map(fd, oldmain); + /* move libraries from old main to new main */ if(bfd && mainlist.first!=mainlist.last) { |