Revision: 15665
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15665
Author:   genscher
Date:     2008-07-21 09:10:10 +0200 (Mon, 21 Jul 2008)

Log Message:
-----------
Enabled fc for testing

Modified Paths:
--------------
    branches/fluidcontrol/source/blender/src/fluidsim.c

Modified: branches/fluidcontrol/source/blender/src/fluidsim.c
===================================================================
--- branches/fluidcontrol/source/blender/src/fluidsim.c 2008-07-21 00:38:42 UTC 
(rev 15664)
+++ branches/fluidcontrol/source/blender/src/fluidsim.c 2008-07-21 07:10:10 UTC 
(rev 15665)
@@ -1066,7 +1066,7 @@
                                fsmesh.obstaclePartslip = 
obit->fluidsimSettings->partSlipValue;
                                fsmesh.volumeInitType = 
obit->fluidsimSettings->volumeInitType;
                                fsmesh.obstacleImpactFactor = 
obit->fluidsimSettings->surfaceSmoothing; // misused value
-                               /*
+                               
                                if(fsmesh.type == OB_FLUIDSIM_CONTROL)
                                {
                                        // control fluids will get exported as 
whole
@@ -1086,7 +1086,7 @@
                                        fsmesh.channelVelocityforceStrength = 
channelVelocityforceStrength[o];
                                        fsmesh.channelVelocityforceRadius = 
channelVelocityforceRadius[o];
                                }
-                               else */
+                               else 
                                {
                                        // set channels to 0
                                        fsmesh.channelAttractforceStrength =
@@ -1219,6 +1219,8 @@
                        pupmenu(fsmessage);
                } // init error
        }
+       
+       // elbeemFree();
 }
 
 void fluidsimFreeBake(struct Object *ob)


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to