[Bf-blender-cvs] [9c15439] master: cloth: Fix overallocation for collisions

Sergej Reich noreply at git.blender.org
Tue Nov 11 18:18:13 CET 2014


Commit: 9c15439c5c91c2834c082c0d2d2434d612764bc2
Author: Sergej Reich
Date:   Tue Nov 11 18:05:00 2014 +0100
Branches: master
https://developer.blender.org/rB9c15439c5c91c2834c082c0d2d2434d612764bc2

cloth: Fix overallocation for collisions

This was introduced when eltopo was added, but not reverted when it was
removed.

===================================================================

M	source/blender/blenkernel/intern/collision.c

===================================================================

diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c
index 2f60093..3030ee4 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++ ) {




More information about the Bf-blender-cvs mailing list