Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-11 12:07:36 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-11 16:34:13 +0300
commit57777b95428cef886bd3b2317b7728fa066acee1 (patch)
treee7555b4ccba56fc33c1a09155c4f25bbcb0d8c1f /source/blender/makesdna/DNA_object_force_types.h
parent2cb181d478c3f54adf91188beca0b3fd3e28bcaf (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/makesdna/DNA_object_force_types.h')
-rw-r--r--source/blender/makesdna/DNA_object_force_types.h4
1 files changed, 4 insertions, 0 deletions
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;