forked from bartvdbraak/blender
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.
This commit is contained in:
parent
64fe7139ec
commit
21f6bac0a3
@ -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) )));
|
||||
|
@ -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':
|
||||
|
Loading…
Reference in New Issue
Block a user