diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-10-11 08:30:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-10-11 08:30:09 +0400 |
| commit | ac5c48d1860c8b4c028154e04114c35727711df3 (patch) | |
| tree | 96ebd4b5ca6cb05a41a8b1395d7f165d4eca5575 /source | |
| parent | 9b948cad08067a6bedd49ccfb059874aba7555b9 (diff) | |
removed warning in fluidsim.c
fixed tooltip for delay sensor - delay is in tics not frames
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/buttons_logic.c | 6 | ||||
| -rw-r--r-- | source/blender/src/fluidsim.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c index cd917581392..0dcdc36fdcd 100644 --- a/source/blender/src/buttons_logic.c +++ b/source/blender/src/buttons_logic.c @@ -1316,12 +1316,12 @@ static short draw_sensorbuttons(bSensor *sens, uiBlock *block, short xco, short ds = sens->data; uiDefButS(block, NUM, 0, "Delay",(short)(10+xco),(short)(yco-44),(short)((width-22)*0.4+10), 19, - &ds->delay, 0.0, 5000.0, 0, 0, "Delay in number of frames before the positive trigger"); + &ds->delay, 0.0, 5000.0, 0, 0, "Delay in number of logic tics before the positive trigger (default 60 per second)"); uiDefButS(block, NUM, 0, "Dur",(short)(10+xco+(width-22)*0.4+10),(short)(yco-44),(short)((width-22)*0.4-10), 19, - &ds->duration, 0.0, 5000.0, 0, 0, "If >0, delay in number of frames before the negative trigger following the positive trigger"); + &ds->duration, 0.0, 5000.0, 0, 0, "If >0, delay in number of logic tics before the negative trigger following the positive trigger"); uiDefButBitS(block, TOG, SENS_DELAY_REPEAT, 0, "REP",(short)(xco + 10 + (width-22)*0.8),(short)(yco - 44), (short)(0.20 * (width-22)), 19, &ds->flag, 0.0, 0.0, 0, 0, - "Toggle repeat option. If selected, the sensor restarts after Delay+Dur frames"); + "Toggle repeat option. If selected, the sensor restarts after Delay+Dur logic tics"); yco-= ysize; break; } diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c index 31cc4b81d7a..9c3116e53db 100644 --- a/source/blender/src/fluidsim.c +++ b/source/blender/src/fluidsim.c @@ -284,7 +284,7 @@ static volatile int globalBakeFrame = 0; static volatile int g_break= 0; // run simulation in seperate thread -static int fluidsimSimulateThread(void *unused) { // *ptr) { +static void *fluidsimSimulateThread(void *unused) { // *ptr) { //char* fnameCfgPath = (char*)(ptr); int ret=0; |