[Bf-blender-cvs] [405121d6136] master: Fix T51759: fluid simulation particles not remoevd when colliding with outflow objects.

Lucas Veber noreply at git.blender.org
Sun Jul 2 22:51:13 CEST 2017


Commit: 405121d61368cd5af1fcaf04787d7260701efe16
Author: Lucas Veber
Date:   Sun Jul 2 22:38:16 2017 +0200
Branches: master
https://developer.blender.org/rB405121d61368cd5af1fcaf04787d7260701efe16

Fix T51759: fluid simulation particles not remoevd when colliding with outflow objects.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D2719

===================================================================

M	intern/elbeem/intern/solver_util.cpp

===================================================================

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;




More information about the Bf-blender-cvs mailing list