diff options
author | Sergej Reich <sergej.reich@googlemail.com> | 2014-11-11 20:05:00 +0300 |
---|---|---|
committer | Sergej Reich <sergej.reich@googlemail.com> | 2014-11-11 20:05:00 +0300 |
commit | 9c15439c5c91c2834c082c0d2d2434d612764bc2 (patch) | |
tree | 301e6f2e1de357a6e10a5d420a24d61c26520b4b /source/blender/blenkernel/intern | |
parent | e43c5fa005c941aa773f35fb6b8398afe37b25e9 (diff) |
cloth: Fix overallocation for collisions
This was introduced when eltopo was added, but not reverted when it was
removed.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 2f600935b1e..3030ee4b4a4 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -648,7 +648,7 @@ static void cloth_bvh_objcollisions_nearcheck ( ClothModifierData * clmd, Collis { int i; - *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult * 64, "collision array" ); // * 4 since cloth_collision_static can return more than 1 collision + *collisions = (CollPair *) MEM_mallocN(sizeof(CollPair) * numresult * 4, "collision array" ); // * 4 since cloth_collision_static can return more than 1 collision *collisions_index = *collisions; for ( i = 0; i < numresult; i++ ) { |