double strike
authorJens Ole Wund <bjornmose@gmx.net>
Sun, 17 Feb 2008 20:13:58 +0000 (20:13 +0000)
committerJens Ole Wund <bjornmose@gmx.net>
Sun, 17 Feb 2008 20:13:58 +0000 (20:13 +0000)
-help MSVC compilers with finite /* hope that won't break cygwin builds */
-a unfinished soft body feature sneaked in (freezer)  .. disabled for now

source/blender/blenkernel/intern/softbody.c
source/blender/blenlib/BLI_arithb.h

index 6054e9ee18bcd4145c87ecfcb06a8cdda05adcd8..11d4a37f976876692672232cc25bce2ef005f6d4 100644 (file)
@@ -2462,6 +2462,7 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float *
                        VecMulf(dx,forcetime);
 
                        /* the freezer */
+                       /*
                        if  ((Inpf(dx,dx)<freezeloc )&&(Inpf(bp->force,bp->force)<freezeforce )){
                                bp->frozen /=2;
                        }
@@ -2469,7 +2470,7 @@ static void softbody_apply_forces(Object *ob, float forcetime, int mode, float *
                                bp->frozen =MIN2(bp->frozen*1.05f,1.0f);
                        }
                        VecMulf(dx,bp->frozen);
-
+            */
                        /* again some nasty if's to have heun in here too */
                        if (mode ==1){
                                VECCOPY(bp->prevpos,bp->pos);
index 54999b1f72bd148995936ba0105ef77f92137690..b3c94ca79baf0c1ab55b624ffb1b1c320ed7cf43 100644 (file)
@@ -57,6 +57,7 @@ extern "C" {
 #ifdef WIN32
        #ifndef FREE_WINDOWS
                #define isnan(n) _isnan(n)
+               #define finite _finite
        #endif
 #endif