From 57777b95428cef886bd3b2317b7728fa066acee1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 11 Mar 2019 10:07:36 +0100 Subject: 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. --- source/blender/makesdna/DNA_object_force_types.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/makesdna/DNA_object_force_types.h') diff --git a/source/blender/makesdna/DNA_object_force_types.h b/source/blender/makesdna/DNA_object_force_types.h index c7bb3dad809..e09df0635ef 100644 --- a/source/blender/makesdna/DNA_object_force_types.h +++ b/source/blender/makesdna/DNA_object_force_types.h @@ -272,11 +272,15 @@ typedef struct PointCache { char info[64]; /** File path, 1024 = FILE_MAX. */ char path[1024]; + /** * Array of length endframe-startframe+1 with flags to indicate cached frames. * Can be later used for other per frame flags too if needed. */ char *cached_frames; + int cached_frames_len; + char _pad1[4]; + struct ListBase mem_cache; struct PTCacheEdit *edit; -- cgit v1.2.3