[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12605] trunk/blender/source/blender: = Fix for softbody collision mode selector =

[Juho Vepsalainen]

Revision: 12605
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12605
Author:   bebraw
Date:     2007-11-16 13:23:00 +0100 (Fri, 16 Nov 2007)

Log Message:
-----------
= Fix for softbody collision mode selector =

This commit makes all softbody collision modes work as they should.

Thanks to Genscher for noticing the issue.

bjornmose, please check this commit.

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

Modified: trunk/blender/source/blender/blenkernel/intern/softbody.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/softbody.c	2007-11-16 12:02:06 UTC (rev 12604)
+++ trunk/blender/source/blender/blenkernel/intern/softbody.c	2007-11-16 12:23:00 UTC (rev 12605)
@@ -782,21 +782,21 @@
 		}
 
 		if (akku_count > 0) {
-			if (sb->sbc_mode == 0){
+			if (sb->sbc_mode == SBC_MODE_MANUAL){
 				bp->colball=sb->colball;
-			}		
-			if (sb->sbc_mode == 1){
-			 bp->colball = akku/(float)akku_count*sb->colball;
 			}
-			if (sb->colball == 2){
+			if (sb->sbc_mode == SBC_MODE_AVG){
+				bp->colball = akku/(float)akku_count*sb->colball;
+			}
+			if (sb->sbc_mode == SBC_MODE_MIN){
 				bp->colball=min*sb->colball;
-			}		
-			if (sb->colball == 3){
+			}
+			if (sb->sbc_mode == SBC_MODE_MAX){
 				bp->colball=max*sb->colball;
-			}		
-			if (sb->colball == 4){
-			bp->colball = (min + max)/2.0f*sb->colball;
-			}		
+			}
+			if (sb->sbc_mode == SBC_MODE_AVGMINMAX){
+				bp->colball = (min + max)/2.0f*sb->colball;
+			}
 		}
 		else bp->colball=0;
 	}/*for bp*/		

Modified: trunk/blender/source/blender/makesdna/DNA_object_force.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_force.h	2007-11-16 12:02:06 UTC (rev 12604)
+++ trunk/blender/source/blender/makesdna/DNA_object_force.h	2007-11-16 12:23:00 UTC (rev 12605)
@@ -143,9 +143,17 @@
 #define OB_SB_EDGECOLL  2048
 #define OB_SB_COLLFINAL 4096
 
+/* sb->solverflags */
 #define SBSO_MONITOR    1 
 #define SBSO_OLDERR     2 
 
+/* sb->sbc_mode */
+#define SBC_MODE_MANUAL		0
+#define SBC_MODE_AVG		1
+#define SBC_MODE_MIN		2
+#define SBC_MODE_MAX		3
+#define SBC_MODE_AVGMINMAX	4
+
 #ifdef __cplusplus
 }
 #endif