[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17013] trunk/blender/source/blender/src: removed warning in fluidsim.c

[Campbell Barton]

Revision: 17013
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17013
Author:   campbellbarton
Date:     2008-10-11 06:30:09 +0200 (Sat, 11 Oct 2008)

Log Message:
-----------
removed warning in fluidsim.c
fixed tooltip for delay sensor - delay is in tics not frames

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_logic.c
    trunk/blender/source/blender/src/fluidsim.c

Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c	2008-10-11 00:56:49 UTC (rev 17012)
+++ trunk/blender/source/blender/src/buttons_logic.c	2008-10-11 04:30:09 UTC (rev 17013)
@@ -1316,12 +1316,12 @@
 			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;
 		}

Modified: trunk/blender/source/blender/src/fluidsim.c
===================================================================
--- trunk/blender/source/blender/src/fluidsim.c	2008-10-11 00:56:49 UTC (rev 17012)
+++ trunk/blender/source/blender/src/fluidsim.c	2008-10-11 04:30:09 UTC (rev 17013)
@@ -284,7 +284,7 @@
 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;