Revision: 14460
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14460
Author:   genscher
Date:     2008-04-18 16:12:42 +0200 (Fri, 18 Apr 2008)

Log Message:
-----------
Fluid bugfix [#8395] [#6200]: this should solve the 
popping/inconsistency/flickering issue with fluids, please give feedback :)

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/solver_util.cpp

Modified: trunk/blender/intern/elbeem/intern/solver_util.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_util.cpp  2008-04-18 02:51:09 UTC 
(rev 14459)
+++ trunk/blender/intern/elbeem/intern/solver_util.cpp  2008-04-18 14:12:42 UTC 
(rev 14460)
@@ -112,7 +112,8 @@
                                        const CellFlagType nbflag = 
RFLAG_NB(lev, i,j,k, workSet,l);
                                        if(nbflag&CFInter){ intercnt++; }
 
-                                       if(l!=mainGravDir) continue; // only 
check bnd along main grav. dir
+                                       // check all directions otherwise we 
get bugs with splashes on obstacles
+                                       // if(l!=mainGravDir) continue; // only 
check bnd along main grav. dir
                                        
//if((nbflag&CFBnd)&&(nbflag&CFBndNoslip)){ noslipbnd=1; }
                                        if((nbflag&CFBnd)){ noslipbnd=1; }
                                }
@@ -140,11 +141,10 @@
                                        if(val<minval) val = minval; 
                                        *mpIso->lbmGetData(i,j,ZKOFF) += 
minval-( val * mIsoWeight[13] ); 
                                }
-#endif // SURFACE_ENH>0
-
                        } else { // all others, unused?
                                continue;
                        } 
+#endif // SURFACE_ENH>0
 
                        *mpIso->lbmGetData( i-1 , j-1 ,ZKOFF-ZKD1) += ( val * 
mIsoWeight[0] ); 
                        *mpIso->lbmGetData( i   , j-1 ,ZKOFF-ZKD1) += ( val * 
mIsoWeight[1] ); 


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to