diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-07-22 06:57:40 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-07-22 06:57:40 +0400 |
| commit | 69327f2ebd6dab06b3f75911ef7a28fd562994be (patch) | |
| tree | 18b8df7d8ac4106f85cb4a907f5edc566f453b7f /source/blender/blenkernel/intern/fluidsim.c | |
| parent | eecc3f51d4632aa028f6a4d550d43b6804db4aaa (diff) | |
| parent | d44d7e220dfbf7b0575ec93f1bb18777f4277eef (diff) | |
merge with trunk at r21785, and also fixed stupid ngon normals bug
Diffstat (limited to 'source/blender/blenkernel/intern/fluidsim.c')
| -rw-r--r-- | source/blender/blenkernel/intern/fluidsim.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index 6c684994e30..214363b4c79 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -83,9 +83,9 @@ void fluidsim_init(FluidsimModifierData *fluidmd) fss->type = OB_FLUIDSIM_ENABLE; fss->show_advancedoptions = 0; - fss->resolutionxyz = 50; - fss->previewresxyz = 25; - fss->realsize = 0.03; + fss->resolutionxyz = 65; + fss->previewresxyz = 45; + fss->realsize = 0.5; fss->guiDisplayMode = 2; // preview fss->renderDisplayMode = 3; // render @@ -98,7 +98,7 @@ void fluidsim_init(FluidsimModifierData *fluidmd) fss->gravy = 0.0; fss->gravz = -9.81; fss->animStart = 0.0; - fss->animEnd = 0.30; + fss->animEnd = 4.0; fss->gstar = 0.005; // used as normgstar fss->maxRefine = -1; // maxRefine is set according to resolutionxyz during bake @@ -114,15 +114,15 @@ void fluidsim_init(FluidsimModifierData *fluidmd) // no bounding box needed // todo - reuse default init from elbeem! - fss->typeFlags = OB_FSBND_NOSLIP; + fss->typeFlags = OB_FSBND_PARTSLIP; fss->domainNovecgen = 0; fss->volumeInitType = 1; // volume - fss->partSlipValue = 0.0; + fss->partSlipValue = 0.2; fss->generateTracers = 0; fss->generateParticles = 0.0; fss->surfaceSmoothing = 1.0; - fss->surfaceSubdivs = 1.0; + fss->surfaceSubdivs = 0.0; fss->particleInfSize = 0.0; fss->particleInfAlpha = 0.0; |