[Bf-committers] SB IPO starter patch

[Johnny Matthews]

Here is a little patch to play with Edge Spring and Friction IPOS. This 
is not for committing...yet :)
-------------- next part --------------
Index: source/blender/blenkernel/intern/ipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/ipo.c,v
retrieving revision 1.14
diff -u -r1.14 ipo.c
--- source/blender/blenkernel/intern/ipo.c	19 Mar 2005 21:08:10 -0000	1.14
+++ source/blender/blenkernel/intern/ipo.c	14 Apr 2005 15:22:25 -0000
@@ -88,7 +88,8 @@
 	OB_ROT_X, OB_ROT_Y, OB_ROT_Z, OB_DROT_X, OB_DROT_Y, OB_DROT_Z, 
 	OB_SIZE_X, OB_SIZE_Y, OB_SIZE_Z, OB_DSIZE_X, OB_DSIZE_Y, OB_DSIZE_Z, 
 	OB_LAY, OB_TIME, OB_EFF_X, OB_EFF_Y, OB_EFF_Z, OB_COL_A,
-	OB_PD_FSTR, OB_PD_FFALL, OB_PD_SDAMP, OB_PD_RDAMP, OB_PD_PERM
+	OB_PD_FSTR, OB_PD_FFALL, OB_PD_SDAMP, OB_PD_RDAMP, OB_PD_PERM, 
+    OB_SB_EFRICT, OB_SB_ESPRING
 };
 
 int ac_ar[AC_TOTIPO]= {
@@ -1068,6 +1069,12 @@
 		case OB_PD_PERM:
 			if(ob->pd) poin= &(ob->pd->pdef_perm);
 			break;
+		case OB_SB_EFRICT:
+			if(ob->soft) poin= &(ob->soft->infrict);
+			break;
+		case OB_SB_ESPRING:
+			if(ob->soft) poin= &(ob->soft->inspring);
+			break;
 		}
 	}
 	else if (GS(id->name)==ID_AC){
@@ -2026,6 +2033,8 @@
 				case OB_PD_SDAMP:
 				case OB_PD_RDAMP:
 				case OB_PD_PERM:
+                case OB_SB_EFRICT:
+                case OB_SB_ESPRING:
 					bezt= icu->bezt;
 					if(bezt) {
 						a= icu->totvert;

Index: source/blender/makesdna/DNA_ipo_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_ipo_types.h,v
retrieving revision 1.14
diff -u -r1.14 DNA_ipo_types.h
--- source/blender/makesdna/DNA_ipo_types.h	1 Mar 2005 13:14:37 -0000	1.14
+++ source/blender/makesdna/DNA_ipo_types.h	14 Apr 2005 15:20:28 -0000
@@ -68,8 +68,8 @@
 
 /* ******************** */
 
-#define OB_TOTIPO	29
-#define OB_TOTNAM	29
+#define OB_TOTIPO	31
+#define OB_TOTNAM	31
 
 #define OB_LOC_X	1
 #define OB_LOC_Y	2
@@ -111,8 +111,8 @@
 #define OB_PD_RDAMP	28
 #define OB_PD_PERM	29
 
-
-
+#define OB_SB_EFRICT	  30
+#define OB_SB_ESPRING	  31
 /* ******************** */
 
 #define MA_TOTIPO	40

Index: source/blender/src/editipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editipo.c,v
retrieving revision 1.50
diff -u -r1.50 editipo.c
--- source/blender/src/editipo.c	11 Apr 2005 17:55:20 -0000	1.50
+++ source/blender/src/editipo.c	14 Apr 2005 15:21:08 -0000
@@ -144,7 +144,8 @@
 						 "RotX", "RotY", "RotZ", "dRotX", "dRotY", "dRotZ",
 						 "SizeX", "SizeY", "SizeZ", "dSizeX", "dSizeY", "dSizeZ",
 						 "Layer", "Time", "ColR", "ColG", "ColB", "ColA",
-						 "FStreng", "FFall", "RDamp", "Damping", "Perm" };
+						 "FStreng", "FFall", "RDamp", "Damping", "Perm",
+                         "SBEFrict", "SBESpring" };
 char *obeff_ic_names[3] = { "EffX", "EffY", "EffZ" };
 char *co_ic_names[CO_TOTNAM] = { "Inf" };
 char *mtex_ic_names[TEX_TOTNAM] = { "OfsX", "OfsY", "OfsZ", "SizeX", "SizeY", "SizeZ",
@@ -220,7 +221,7 @@
 	if(!colipo && (nr>=OB_EFF_X && nr <=OB_EFF_Z)) {
 		return obeff_ic_names[nr-OB_EFF_X];
 	} else {
-		if(nr>=OB_LOC_X && nr <= OB_PD_PERM) return ob_ic_names[nr-1];
+		if(nr>=OB_LOC_X && nr <= OB_SB_ESPRING) return ob_ic_names[nr-1];
 	}
 	return ic_name_empty[0];
 }