diff options
| author | Nils Thuerey <nils@thuerey.de> | 2006-05-11 17:19:41 +0400 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2006-05-11 17:19:41 +0400 |
| commit | 74fc4fa254554da1046584677e9ebb0375bce246 (patch) | |
| tree | 7e87208888359930a8a9c7e55a2900e2f81e16e9 /source/blender/src/fluidsim.c | |
| parent | 0497ea57cb6be0cbe70380647025b90ed7faf6d8 (diff) | |
- fixed MSVC problem in fluidsim.c
- removed some more debug output in the solver
Diffstat (limited to 'source/blender/src/fluidsim.c')
| -rw-r--r-- | source/blender/src/fluidsim.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/source/blender/src/fluidsim.c b/source/blender/src/fluidsim.c index a712f96e66e..8d5e6e7ff6b 100644 --- a/source/blender/src/fluidsim.c +++ b/source/blender/src/fluidsim.c @@ -71,8 +71,7 @@ #include "BKE_DerivedMesh.h" #include "BKE_ipo.h" #include "LBM_fluidsim.h" -// FIXME move? -// TODO FIXME DOUBLE elbeem.h! in intern/extern... +// TODO FIXME double elbeem.h in intern/extern... #include "elbeem.h" #include "BLI_editVert.h" @@ -925,9 +924,7 @@ void fluidsimBake(struct Object *ob) int *tris=NULL; int numVerts=0, numTris=0; int o = channelObjCount; - //Key *shapekey= ob_get_key(obit); - int deform; // = (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL); - deform = (obit->fluidsimSettings->domainNovecgen); + int deform = (obit->fluidsimSettings->domainNovecgen); elbeemMesh fsmesh; elbeemResetMesh( &fsmesh ); fsmesh.type = obit->fluidsimSettings->type;; @@ -1250,10 +1247,7 @@ void fluidsimBake(struct Object *ob) (obit->fluidsimSettings->type != OB_FLUIDSIM_DOMAIN) && (obit->fluidsimSettings->type != OB_FLUIDSIM_PARTICLE) ) { - //Key *shapekey= ob_get_key(obit); - // armature check from effect.c - int deform; //= (shapekey && BLI_countlist(&shapekey->block) >0)||(obit->parent && obit->partype==PARSKEL); - deform = (obit->fluidsimSettings->domainNovecgen); + int deform = (obit->fluidsimSettings->domainNovecgen); fluidsimGetGeometryObjFilename(obit, fnameObjdat); strcpy(targetFile, targetDir); |