1 files changed, 23 insertions, 26 deletions

diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c
index 02912e38204..277f0852f90 100644
--- a/source/blender/modifiers/intern/MOD_fluidsim_util.c
+++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c
@@ -90,10 +90,10 @@ void fluidsim_init(FluidsimModifierData *fluidmd)
 		fss->viscosityValue = 1.0;
 		fss->viscosityExponent = 6;
 		
-		// dg TODO: change this to []
-		fss->gravx = 0.0;
-		fss->gravy = 0.0;
-		fss->gravz = -9.81;
+		fss->grav[0] = 0.0;
+		fss->grav[1] = 0.0;
+		fss->grav[2] = -9.81;
+
 		fss->animStart = 0.0; 
 		fss->animEnd = 4.0;
 		fss->gstar = 0.005; // used as normgstar
@@ -111,7 +111,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd)
 		// no bounding box needed
 		
 		// todo - reuse default init from elbeem!
-		fss->typeFlags = OB_FSBND_PARTSLIP;
+		fss->typeFlags = OB_FSBND_PARTSLIP | OB_FSSG_NOOBS;
 		fss->domainNovecgen = 0;
 		fss->volumeInitType = 1; // volume
 		fss->partSlipValue = 0.2;
@@ -139,8 +139,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd)
 		fluid_get_bb(mesh->mvert, mesh->totvert, ob->obmat, fss->bbStart, fss->bbSize);	
 		*/
 		
-		// (ab)used to store velocities
-		fss->meshSurfNormals = NULL;
+		fss->meshVelocities = NULL;
 		
 		fss->lastgoodframe = -1;
 		
@@ -158,10 +157,10 @@ void fluidsim_free(FluidsimModifierData *fluidmd)
 #ifndef DISABLE_ELBEEM
 	if(fluidmd)
 	{
-		if(fluidmd->fss->meshSurfNormals)
+		if(fluidmd->fss->meshVelocities)
 		{
-			MEM_freeN(fluidmd->fss->meshSurfNormals);
-			fluidmd->fss->meshSurfNormals = NULL;
+			MEM_freeN(fluidmd->fss->meshVelocities);
+			fluidmd->fss->meshVelocities = NULL;
 		}
 		MEM_freeN(fluidmd->fss);
 	}
@@ -394,12 +393,12 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
 	FluidsimSettings *fss = fluidmd->fss;
 	int len = strlen(filename);
 	int totvert = dm->getNumVerts(dm);
-	float *velarray = NULL;
+	FluidVertexVelocity *velarray = NULL;
 
 	// mesh and vverts have to be valid from loading...
 
-	if(fss->meshSurfNormals)
-		MEM_freeN(fss->meshSurfNormals);
+	if(fss->meshVelocities)
+		MEM_freeN(fss->meshVelocities);
 
 	if(len<7)
 	{
@@ -408,12 +407,10 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
 
 	if(fss->domainNovecgen>0) return;
 
-	// abusing pointer to hold an array of 3d-velocities
-	fss->meshSurfNormals = MEM_callocN(sizeof(float)*3*dm->getNumVerts(dm), "Fluidsim_velocities");
-	// abusing pointer to hold an INT
-	fss->meshSurface = SET_INT_IN_POINTER(totvert);
+	fss->meshVelocities = MEM_callocN(sizeof(FluidVertexVelocity)*dm->getNumVerts(dm), "Fluidsim_velocities");
+	fss->totvert = totvert;
 
-	velarray = (float *)fss->meshSurfNormals;
+	velarray = fss->meshVelocities;
 
 	// .bobj.gz , correct filename
 	// 87654321
@@ -424,16 +421,16 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
 	gzf = gzopen(filename, "rb");
 	if (!gzf)
 	{
-		MEM_freeN(fss->meshSurfNormals);
-		fss->meshSurfNormals = NULL;
+		MEM_freeN(fss->meshVelocities);
+		fss->meshVelocities = NULL;
 		return;
 	}
 
 	gzread(gzf, &wri, sizeof( wri ));
 	if(wri != totvert)
 	{
-		MEM_freeN(fss->meshSurfNormals);
-		fss->meshSurfNormals = NULL;
+		MEM_freeN(fss->meshVelocities);
+		fss->meshVelocities = NULL;
 		return;
 	}
 
@@ -442,7 +439,7 @@ static void fluidsim_read_vel_cache(FluidsimModifierData *fluidmd, DerivedMesh *
 		for(j=0; j<3; j++)
 		{
 			gzread(gzf, &wrf, sizeof( wrf ));
-			velarray[3*i + j] = wrf;
+			velarray[i].vel[j] = wrf;
 		}
 	}
 
@@ -531,10 +528,10 @@ static DerivedMesh *fluidsim_read_cache(DerivedMesh *orgdm, FluidsimModifierData
 	}
 	else
 	{
-		if(fss->meshSurfNormals)
-			MEM_freeN(fss->meshSurfNormals);
+		if(fss->meshVelocities)
+			MEM_freeN(fss->meshVelocities);
 
-		fss->meshSurfNormals = NULL;
+		fss->meshVelocities = NULL;
 	}
 
 	return dm;