Revision: 15851
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15851
Author: genscher
Date: 2008-07-28 22:24:05 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
Bugfix for messed up UI (reported by nudel)
Modified Paths:
--------------
branches/fluidcontrol/source/blender/src/buttons_object.c
branches/fluidcontrol/source/blender/src/fluidsim.c
Modified: branches/fluidcontrol/source/blender/src/buttons_object.c
===================================================================
--- branches/fluidcontrol/source/blender/src/buttons_object.c 2008-07-28
19:31:08 UTC (rev 15850)
+++ branches/fluidcontrol/source/blender/src/buttons_object.c 2008-07-28
20:24:05 UTC (rev 15851)
@@ -5182,9 +5182,9 @@
yline -= lineHeight;
yline -= 1*separateHeight;
+ uiBlockBeginAlign ( block );
uiDefButBitS ( block, TOG, OB_FLUIDSIM_REVERSE,
REDRAWBUTSOBJECT, "Reverse", 0, yline,50,objHeight,
&fss->show_advancedoptions, 0, 0, 0, 0, "Reverse fluidsim frames" );
uiDefBut ( block, LABEL, 0, "",
50,yline,25,objHeight, NULL, 0.0, 0, 0, 0, "" );
- uiBlockBeginAlign ( block );
uiDefIconBut ( block, BUT, B_FLUIDSIM_SELDIR,
ICON_FILESEL, 75, yline, 20, objHeight, 0, 0, 0, 0, 0,
"Select Directory (and/or filename prefix) to store baked fluid simulation
files in" );
uiDefBut ( block, TEX,
B_BAKE_CACHE_CHANGE,"", 95, yline, 205, objHeight,
fss->surfdataPath, 0.0,79.0, 0, 0, "Enter Directory (and/or filename prefix)
to store baked fluid simulation files in" );
Modified: branches/fluidcontrol/source/blender/src/fluidsim.c
===================================================================
--- branches/fluidcontrol/source/blender/src/fluidsim.c 2008-07-28 19:31:08 UTC
(rev 15850)
+++ branches/fluidcontrol/source/blender/src/fluidsim.c 2008-07-28 20:24:05 UTC
(rev 15851)
@@ -1025,12 +1025,12 @@
char busy_mess[80];
waitcursor(1);
-
+ /*
// lukep we add progress bar as an interim
mesure
percentdone = globalBakeFrame / noFramesf;
sprintf(busy_mess, "baking fluids %d / %d
|||", globalBakeFrame, (int) noFramesf);
progress_bar(percentdone, busy_mess );
-
+ */
SDL_Delay(2000); // longer delay to prevent
frequent redrawing
SDL_mutexP(globalBakeLock);
if(globalBakeState != 0) done = 1; // 1=ok,
<0=error/abort
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
