diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-22 02:09:09 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-04-22 02:09:09 +0400 |
| commit | 21f6bac0a33d6613b0a8033be6fcb6befd419cc9 (patch) | |
| tree | e2090689a872652692485975cbde865b129f8b1f | |
| parent | 64fe7139ec10531972ceec7137eaa7fdec7cfef7 (diff) | |
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.
| -rw-r--r-- | intern/elbeem/intern/solver_init.cpp | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_fluid.py | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/intern/elbeem/intern/solver_init.cpp b/intern/elbeem/intern/solver_init.cpp index 58f45e4fbfb..7e9f5e7f420 100644 --- a/intern/elbeem/intern/solver_init.cpp +++ b/intern/elbeem/intern/solver_init.cpp @@ -1453,9 +1453,7 @@ 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; } - /* 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) ))); diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index cec4bf125ee..beb525bbd07 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -55,11 +55,11 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): 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': |