diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:49:35 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2017-07-03 19:53:00 +0300 |
| commit | e1482841dd5dd55cb453d37d115ec80f44c02316 (patch) | |
| tree | 63cee90e2ab7b4316b4e36ffeb181700e99d6aab /intern/elbeem | |
| parent | 1ad0cc6bde4746949eee7a9babb97178a05816c3 (diff) | |
| parent | 1fb30758034c2f83862bb7fc5f30a1a4d7b4510b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/elbeem')
| -rw-r--r-- | intern/elbeem/intern/solver_util.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp index 5e112eb3f29..4bcc3640d72 100644 --- a/intern/elbeem/intern/solver_util.cpp +++ b/intern/elbeem/intern/solver_util.cpp @@ -855,6 +855,10 @@ void LbmFsgrSolver::advanceParticles() { if(k<=mSizez-1-cutval){ CellFlagType pflag = RFLAG(level, i,j,k, workSet); //errMsg("PIT move"," at "<<PRINT_IJK<<" flag"<<convertCellFlagType2String(pflag) ); + if (pflag & CFMbndOutflow) { + DEL_PART; + continue; + } if(pflag & (CFBnd)) { handleObstacleParticle(p); continue; |