diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-08 13:16:41 +0300 |
| commit | 788c75ed879fb25a35c0a0e9245df7aeaae2f4ab (patch) | |
| tree | 3b1c315078e257e0401904860f9ec90fe60390ee /intern/elbeem/intern | |
| parent | 1ffd9714b930dbef8059403d69650476f625f554 (diff) | |
| parent | 45f833c21dcfad4d1d7045987bb8b69d6aab05be (diff) | |
Merge branch 'master' into viewport_bvh_selectviewport_bvh_select
Diffstat (limited to 'intern/elbeem/intern')
| -rw-r--r-- | intern/elbeem/intern/controlparticles.cpp | 3 | ||||
| -rw-r--r-- | intern/elbeem/intern/isosurface.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/intern/elbeem/intern/controlparticles.cpp b/intern/elbeem/intern/controlparticles.cpp index 526fac0cc6b..f6329ad4b67 100644 --- a/intern/elbeem/intern/controlparticles.cpp +++ b/intern/elbeem/intern/controlparticles.cpp @@ -1316,7 +1316,8 @@ void ControlParticles::finishControl(std::vector<ControlForces> &forces, LbmFloa if(cvweight>1.) { cvweight = 1.; } // thus cvweight is in the range of 0..influenceVelocity, currently not normalized by numCParts cvweight *= ivel; - if(cvweight<0.) cvweight=0.; if(cvweight>1.) cvweight=1.; + if(cvweight<0.) cvweight=0.; + if(cvweight>1.) cvweight=1.; // LBM, FIXME todo use relaxation factor //pvel = (cvel*0.5 * cvweight) + (pvel * (1.0-cvweight)); forces[i].weightVel = cvweight; diff --git a/intern/elbeem/intern/isosurface.h b/intern/elbeem/intern/isosurface.h index 15b923866d3..30fd9adfee1 100644 --- a/intern/elbeem/intern/isosurface.h +++ b/intern/elbeem/intern/isosurface.h @@ -67,8 +67,10 @@ class IsoSurface : /*! set # of subdivisions, this has to be done before init! */ void setSubdivs(int s) { if(mInitDone) errFatal("IsoSurface::setSubdivs","Changing subdivs after init!", SIMWORLD_INITERROR); - if(s<1) s=1; if(s>10) s=10; - mSubdivs = s; } + if(s<1) s=1; + if(s>10) s=10; + mSubdivs = s; + } int getSubdivs() { return mSubdivs;} /*! set full edge settings, this has to be done before init! */ void setUseFulledgeArrays(bool set) { |