[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45832] trunk/blender: Fix [#30954] Fluid obstacle checkbox has no effect

[Daniel Genrich]

Revision: 45832
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45832
Author:   genscher
Date:     2012-04-21 22:09:09 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
Fix [#30954] Fluid obstacle checkbox has no effect

Note: Supporting obstacles which can be enabled/disabled as animated propoerty is not likely to happen. So I marked this as "Won't fix"/TODO.
I also reverted last commit on this bug because it didn't work and disabled the property from UI to avoid confusion.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/solver_init.cpp
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py

Modified: trunk/blender/intern/elbeem/intern/solver_init.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_init.cpp	2012-04-21 15:56:50 UTC (rev 45831)
+++ trunk/blender/intern/elbeem/intern/solver_init.cpp	2012-04-21 22:09:09 UTC (rev 45832)
@@ -1453,9 +1453,7 @@
 			//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; }
-			/* 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;
+			if((!active) && (otype&(CFMbndOutflow|CFMbndInflow)) ) continue;
 
 			// copied from  recalculateObjectSpeeds
 			mObjectSpeeds[OId] = vec2L(mpParam->calculateLattVelocityFromRw( vec2P( (*mpGiObjects)[OId]->getInitialVelocity(mSimulationTime) )));

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2012-04-21 15:56:50 UTC (rev 45831)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py	2012-04-21 22:09:09 UTC (rev 45832)
@@ -55,11 +55,11 @@
             return
 
         col.prop(fluid, "type")
-        if fluid.type not in {'NONE', 'DOMAIN', 'PARTICLE', 'FLUID'}:
+        if fluid.type not in {'NONE', 'DOMAIN', 'PARTICLE', 'FLUID', 'OBSTACLE'}:
             col.prop(fluid, "use")
 
         layout = layout.column()
-        if fluid.type not in {'NONE', 'DOMAIN', 'PARTICLE', 'FLUID'}:
+        if fluid.type not in {'NONE', 'DOMAIN', 'PARTICLE', 'FLUID', 'OBSTACLE'}:
             layout.active = fluid.use
 
         if fluid.type == 'DOMAIN':