Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Veber <lucky3>2017-07-02 23:38:16 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2017-07-02 23:42:08 +0300
commit405121d61368cd5af1fcaf04787d7260701efe16 (patch)
tree6bd624ce989d476ffe4f04ff362d8b48eabef879 /intern/elbeem
parent3232d8ec8f15ad00ff16fd4326258de0b0b83486 (diff)
Fix T51759: fluid simulation particles not remoevd when colliding with outflow objects.
Reviewed By: brecht Differential Revision: https://developer.blender.org/D2719
Diffstat (limited to 'intern/elbeem')
-rw-r--r--intern/elbeem/intern/solver_util.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/elbeem/intern/solver_util.cpp b/intern/elbeem/intern/solver_util.cpp
index 6eca427c787..f0c7bce2b4e 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;