[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45655] trunk/blender/intern/elbeem/intern /solver_init.cpp: Bugfix [#30954] Fluid obstacle checkbox has no effect

Daniel Genrich daniel.genrich at gmx.net
Sun Apr 15 12:31:38 CEST 2012


Revision: 45655
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45655
Author:   genscher
Date:     2012-04-15 10:31:38 +0000 (Sun, 15 Apr 2012)
Log Message:
-----------
Bugfix [#30954] Fluid obstacle checkbox has no effect

Needs testing for sideeffects. 

If there are negative sideeffects, revert commit and mark as "will not fix"/"not supported"/"needs UI fix".

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

Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp	2012-04-15 10:31:07 UTC (rev 45654)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp	2012-04-15 10:31:38 UTC (rev 45655)
@@ -1453,7 +1453,9 @@
 			//errMsg("GEOACTT"," obj "<<obj->getName()<<" a:"<<active<<","<<wasActive<<"  s"<<sourceTime<<" t"<<targetTime <<" v"<<mObjectSpeeds[OId] );
 			// skip inactive in/out flows
 			if(ntype==CFInvalid){ errMsg("LbmFsgrSolver::initMovingObstacles","Invalid obj type "<<obj->getGeoInitType()); continue; }
-			if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue;
+			/* DG: only inflows/outlfows could be activated/deactivated, test new code that everything can be activated
+			if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue; */
+			if((!active) /* && (otype&(CFMbndOutflow|CFMbndInflow)) */ ) continue;
 
 			// copied from  recalculateObjectSpeeds
 			mObjectSpeeds[OId] = vec2L(mpParam->calculateLattVelocityFromRw( vec2P( (*mpGiObjects)[OId]->getInitialVelocity(mSimulationTime) )));




More information about the Bf-blender-cvs mailing list