svn merge -r 15409:15529 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 11 Jul 2008 14:44:20 +0000 (14:44 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 11 Jul 2008 14:44:20 +0000 (14:44 +0000)
1  2 
source/blender/makesdna/DNA_object_fluidsim.h
source/blender/src/buttons_object.c

index 3426b1426a33de236e05ff9ca8e3accc367e388d,9b1e4fb56cbdb7ada710217581161e7693d89cc5..a8c4d216f26a85c793a54f9a917b22a5e5f34104
@@@ -117,17 -117,7 +117,19 @@@ typedef struct FluidsimSettings 
  
        /* save fluidsurface normals in mvert.no, and surface vertex velocities (if available) in mvert.co */
        struct MVert *meshSurfNormals;
 +      
 +      /* Fluid control settings */
 +      float cpsTimeStart;
 +      float cpsTimeEnd;
 +      float cpsQuality;
 +      
 +      float attractforceStrength;
 +      float attractforceRadius;
 +      float velocityforceStrength;
 +      float velocityforceRadius;
 +
++      int pad;
  } FluidsimSettings;
  
  /* ob->fluidsimSettings defines */
index 6146fb045d4a83c27e954fb0dd49a991356c265d,ebe770c89e77de2cc8c1546d8c00a7d2e61becdd..724201234b407523fb7dd8d4de57e4d35c849ad3
@@@ -5069,7 -5067,7 +5069,7 @@@ static void object_panel_fluidsim(Objec
  
                                        if(fss->typeFlags&OB_FSBND_PARTSLIP) {
                                                uiDefBut(block, LABEL, 0, "PartSlipValue:",             0,yline,200,objHeight, NULL, 0.0, 0, 0, 0, "");
-                                               uiDefButF(block, NUM, B_DIFF, "Amount of mixing between no- and free-slip, 0=stickier, 1=same as free slip.", 200, yline,100,objHeight, &fss->partSlipValue, 0.0, 1.0, 10,0, ".");
 -                                              uiDefButF(block, NUM, B_DIFF, "", 200, yline,100,objHeight, &fss->partSlipValue, 0.0, 1.0, 10,0, ".");
++                                              uiDefButF(block, NUM, B_DIFF, "", 200, yline,100,objHeight, &fss->partSlipValue, 0.0, 1.0, 10,0, "Amount of mixing between no- and free-slip, 0=stickier, 1=same as free slip.");
                                                yline -= lineHeight;
                                        } else { 
                                                //uiDefBut(block, LABEL, 0, "-",        200,yline,100,objHeight, NULL, 0.0, 0, 0, 0, "");