archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- fixed manual viscosity bug (#4733)

Browse Source 
- added some more free/copy checks for bug 4094, but
  still not enough
This commit is contained in:
Nils Thuerey
2006-07-20 15:27:55 +00:00
parent 873d46aeac
commit 12a1fc374e
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -2496,9 +2496,9 @@ void loadFluidsimMesh(Object *srcob, int useRenderParams)
Mesh *freeFsMesh = srcob->fluidsimSettings->meshSurface;
// similar to free_mesh(...) , but no things like unlink...
if(freeFsMesh->mvert) MEM_freeN(freeFsMesh->mvert);
if(freeFsMesh->medge) MEM_freeN(freeFsMesh->medge);
if(freeFsMesh->mface) MEM_freeN(freeFsMesh->mface);
if(freeFsMesh->mvert){ MEM_freeN(freeFsMesh->mvert); freeFsMesh->mvert=NULL; }
if(freeFsMesh->medge){ MEM_freeN(freeFsMesh->medge); freeFsMesh->medge=NULL; }
if(freeFsMesh->mface){ MEM_freeN(freeFsMesh->mface); freeFsMesh->mface=NULL; }
MEM_freeN(freeFsMesh);
if(srcob->data == srcob->fluidsimSettings->meshSurface)

7
source/blender/blenkernel/intern/object.c
View File

@@ -902,9 +902,10 @@ Object *copy_object(Object *ob)
obn->soft= copy_softbody(ob->soft);
/* NT copy fluid sim setting memory */
//if(obn->fluidsimSettings) obn->fluidsimSettings = MEM_dupallocN(ob->fluidsimSettings);
//else obn->fluidsimSettings = NULL;
obn->fluidsimSettings = fluidsimSettingsCopy(ob->fluidsimSettings);
if(obn->fluidsimSettings) {
obn->fluidsimSettings = fluidsimSettingsCopy(ob->fluidsimSettings);
obn->fluidsimSettings->orgMesh = (Mesh *)obn->data;
}
obn->derivedDeform = NULL;
obn->derivedFinal = NULL;

22
source/blender/src/fluidsim.c
View File

@@ -163,7 +163,7 @@ FluidsimSettings *fluidsimSettingsNew(struct Object *srcob)
fss->renderDisplayMode = 3; // render
fss->viscosityMode = 2; // default to water
fss->viscosityValue = 0.1;
fss->viscosityValue = 1.0;
fss->viscosityExponent = 6;
fss->gravx = 0.0;
fss->gravy = 0.0;
@@ -244,21 +244,23 @@ void fluidsimSettingsFree(FluidsimSettings *fss)
{
Mesh *freeFsMesh = fss->meshSurface;
if(freeFsMesh) {
if(freeFsMesh->mvert) MEM_freeN(freeFsMesh->mvert);
if(freeFsMesh->medge) MEM_freeN(freeFsMesh->medge);
if(freeFsMesh->mface) MEM_freeN(freeFsMesh->mface);
if(freeFsMesh->mvert){ MEM_freeN(freeFsMesh->mvert); freeFsMesh->mvert=NULL; }
if(freeFsMesh->medge){ MEM_freeN(freeFsMesh->medge); freeFsMesh->medge=NULL; }
if(freeFsMesh->mface){ MEM_freeN(freeFsMesh->mface); freeFsMesh->mface=NULL; }
MEM_freeN(freeFsMesh);
fss->meshSurface = NULL;
}
freeFsMesh = fss->meshBB;
if(freeFsMesh) { // same as before...
if(freeFsMesh->mvert) MEM_freeN(freeFsMesh->mvert);
if(freeFsMesh->medge) MEM_freeN(freeFsMesh->medge);
if(freeFsMesh->mface) MEM_freeN(freeFsMesh->mface);
if(freeFsMesh->mvert){ MEM_freeN(freeFsMesh->mvert); freeFsMesh->mvert=NULL; }
if(freeFsMesh->medge){ MEM_freeN(freeFsMesh->medge); freeFsMesh->medge=NULL; }
if(freeFsMesh->mface){ MEM_freeN(freeFsMesh->mface); freeFsMesh->mface=NULL; }
MEM_freeN(freeFsMesh);
fss->meshBB = NULL;
}
if(fss->meshSurfNormals) MEM_freeN(fss->meshSurfNormals);
if(fss->meshSurfNormals){ MEM_freeN(fss->meshSurfNormals); fss->meshSurfNormals=NULL; }
MEM_freeN(fss);
}
@@ -688,8 +690,8 @@ void fluidsimBake(struct Object *ob)
// blender specific - scale according to map old/new settings in anim panel:
aniFrlen = G.scene->r.framelen;
if(domainSettings->viscosityMode==1) {
/* manual mode */
calcViscosity = (1.0/(domainSettings->viscosityExponent*10)) * domainSettings->viscosityValue;
/* manual mode, visc=value/(10^-vexp) */
calcViscosity = (1.0/pow(10.0,domainSettings->viscosityExponent)) * domainSettings->viscosityValue;
} else {
calcViscosity = fluidsimViscosityPreset[ domainSettings->viscosityMode ];
}