archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #32920: cloth physics with collision exploding in some cases, due to

Browse Source 
uninitialized memory usage.
This commit is contained in:
Brecht Van Lommel
2012-10-19 16:44:08 +00:00
parent f72f1dca6c
commit 7e620f04a1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/collision.c
View File

@@ -458,7 +458,8 @@ static CollPair* cloth_collision(ModifierData *md1, ModifierData *md2,
distance = 2.0 * (double)( epsilon1 + epsilon2 + ALMOST_ZERO ); distance = 2.0 * (double)( epsilon1 + epsilon2 + ALMOST_ZERO );
#endif #endif
if (distance <= (epsilon1 + epsilon2 + ALMOST_ZERO)) { // distance -1 means no collision result
if (distance != -1.0f && (distance <= (epsilon1 + epsilon2 + ALMOST_ZERO))) {
normalize_v3_v3(collpair->normal, collpair->vector); normalize_v3_v3(collpair->normal, collpair->vector);
collpair->distance = distance; collpair->distance = distance;