diff options
author | Bastien Montagne <bastien@blender.org> | 2020-07-06 17:21:41 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-07-06 17:55:38 +0300 |
commit | ee3eba902a0b5d5f44b1cb2ff52a3a42cc9e9670 (patch) | |
tree | 8e6e50a808e6e29a6bb3f44b953912764e1452e6 /source/blender/blenloader/intern/readblenentry.c | |
parent | bfc644dcfb52b873ad7c356cf4b05208fba17bba (diff) |
Runtime cache preservation during undo: add support for nodes and embedded IDs.
Diffstat (limited to 'source/blender/blenloader/intern/readblenentry.c')
-rw-r--r-- | source/blender/blenloader/intern/readblenentry.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c index e4129282a68..cb2094d050f 100644 --- a/source/blender/blenloader/intern/readblenentry.c +++ b/source/blender/blenloader/intern/readblenentry.c @@ -390,12 +390,6 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, blo_make_old_idmap_from_main(fd, old_mainlist.first); } - /* TODO: Move handling of nodetree caches to new system as well... */ - /* 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); - /* removed packed data from this trick - it's internal data that needs saves */ /* Store all existing ID caches pointers into a mapping, to allow restoring them into newly @@ -407,12 +401,6 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain, /* Ensure relinked caches are not freed together with their old IDs. */ blo_cache_storage_old_bmain_clear(fd, oldmain); - /* TODO: Move handling of nodetree caches to new system as well... */ - /* 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); - /* Still in-use libraries have already been moved from oldmain to new mainlist, * but oldmain itself shall *never* be 'transferred' to new mainlist! */ BLI_assert(old_mainlist.first == oldmain); |