diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 12:07:36 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-11 16:34:13 +0300 |
| commit | 57777b95428cef886bd3b2317b7728fa066acee1 (patch) | |
| tree | e7555b4ccba56fc33c1a09155c4f25bbcb0d8c1f /source/blender/blenloader | |
| parent | 2cb181d478c3f54adf91188beca0b3fd3e28bcaf (diff) | |
Fix T61906: crash rendering softbody with Cycles and timeline visible.
Make sure we don't reallocate arrays in the pointcache when not needed, the
size of a memory allocation can be slightly bigger than the requested size.
Also, use consistent check for shared cached in copy and free functions.
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 49c62372a85..4b1ca9aeaef 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4582,6 +4582,7 @@ static void direct_link_pointcache(FileData *fd, PointCache *cache) cache->edit = NULL; cache->free_edit = NULL; cache->cached_frames = NULL; + cache->cached_frames_len = 0; } static void direct_link_pointcache_list(FileData *fd, ListBase *ptcaches, PointCache **ocache, int force_disk) |