[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51428] trunk/blender/source/blender/ blenkernel/intern/collision.c: Fix #32920: cloth physics with collision exploding in some cases, due to

[Brecht Van Lommel]

Revision: 51428
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51428
Author:   blendix
Date:     2012-10-19 16:44:08 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
Fix #32920: cloth physics with collision exploding in some cases, due to
uninitialized memory usage.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2012-10-19 16:43:10 UTC (rev 51427)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2012-10-19 16:44:08 UTC (rev 51428)
@@ -458,7 +458,8 @@
 		distance = 2.0 * (double)( epsilon1 + epsilon2 + ALMOST_ZERO );
 #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);
 
 			collpair->distance = distance;