[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29463] trunk/blender/source/blender/ blenkernel/intern/softbody.c: soft body

[Jens Ole Wund (bjornmose)]

Revision: 29463
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29463
Author:   bjornmose
Date:     2010-06-15 11:47:37 +0200 (Tue, 15 Jun 2010)

Log Message:
-----------
soft body
disable edge collision for bezier handles
because of massive pointlessness

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

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2010-06-15 08:39:07 UTC (rev 29462)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2010-06-15 09:47:37 UTC (rev 29463)
@@ -83,7 +83,7 @@
 
 /* ********** soft body engine ******* */
 
-typedef	enum {SB_EDGE=1,SB_BEND=2,SB_STIFFQUAD=3} type_spring;
+typedef	enum {SB_EDGE=1,SB_BEND=2,SB_STIFFQUAD=3,SB_HANDLE=4} type_spring;
 
 typedef struct BodySpring {
 	int v1, v2;
@@ -2129,6 +2129,7 @@
 	kw = kw * kw;
 	switch (bs->springtype){
 		case SB_EDGE:
+		case SB_HANDLE:
 			forcefactor *=  kw;
 			break;
 		case SB_BEND:
@@ -3607,21 +3608,21 @@
 
 				if(totspring) {
 					if(a>0) {
-						bs->v1= curindex-1;
+						bs->v1= curindex-3;
 						bs->v2= curindex;
-						bs->springtype=SB_EDGE;
-						bs->len= globallen( (bezt-1)->vec[2], bezt->vec[0], ob );
+						bs->springtype=SB_HANDLE;
+						bs->len= globallen( (bezt-1)->vec[0], bezt->vec[0], ob );
 						bs++;
 					}
 					bs->v1= curindex;
 					bs->v2= curindex+1;
-					bs->springtype=SB_EDGE;
+					bs->springtype=SB_HANDLE;
 					bs->len= globallen( bezt->vec[0], bezt->vec[1], ob );
 					bs++;
 
 					bs->v1= curindex+1;
 					bs->v2= curindex+2;
-					bs->springtype=SB_EDGE;
+					bs->springtype=SB_HANDLE;
 					bs->len= globallen( bezt->vec[1], bezt->vec[2], ob );
 					bs++;
 				}