From c96be5c5f96b6bc959d1fe8a1d211b90d508f065 Mon Sep 17 00:00:00 2001
From: Daniel Genrich <daniel.genrich@gmx.net>
Date: Sun, 15 Apr 2012 10:31:38 +0000
Subject: 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".
---
 intern/elbeem/intern/solver_init.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp
index 7e9f5e7f420..58f45e4fbfb 100644
--- a/intern/elbeem/intern/solver_init.cpp
+++ b/intern/elbeem/intern/solver_init.cpp
@@ -1453,7 +1453,9 @@ void LbmFsgrSolver::initMovingObstacles(bool staticInit) {
 			//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) )));
-- 
cgit v1.2.3