[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15130] trunk/blender/source/blender/ blenkernel/intern/collision.c: Bugfix for exploding cloth collisions

Daniel Genrich daniel.genrich at gmx.net
Thu Jun 5 12:52:52 CEST 2008


Revision: 15130
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15130
Author:   genscher
Date:     2008-06-05 12:52:52 +0200 (Thu, 05 Jun 2008)

Log Message:
-----------
Bugfix for exploding cloth collisions

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	2008-06-05 10:43:53 UTC (rev 15129)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2008-06-05 10:52:52 UTC (rev 15130)
@@ -683,7 +683,8 @@
 
 			collpair->distance = distance;
 			collpair->flag = 0;
-		}
+			collpair++;
+		}/*
 		else
 		{
 			float w1, w2, w3, u1, u2, u3;
@@ -716,9 +717,9 @@
 			{
 				// check for collision in the future
 				collpair->flag |= COLLISION_IN_FUTURE;
+				collpair++;
 			}
-		}
-		collpair++;
+		}*/
 	}
 	return collpair;
 }





More information about the Bf-blender-cvs mailing list