blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix T80833: Fluid Initial Velocity 'Source' incorrect when enabling Inflow 

Do not escape flow / effector objects if they have a disabled use flow / use effector flag.

Vertex velocities still need to be kept track of in order to have correct object velocities when enabling flows / effectors intermittenly. It is possible though to skip the emission loop if the flags are disabled.
This commit is contained in:
Sebastián Barschkis 2020-09-23 15:54:08 +02:00
parent 738615cdfd
commit bda274d1fe
Notes: blender-bot 2023-02-14 03:44:41 +01:00 
Referenced by issue #80833, Fluid Initial Velocity 'Source' incorrect when enabling Inflow
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/blenkernel/intern/fluid.c
View File

@ -1085,7 +1085,9 @@ static void obstacles_from_mesh(Object *coll_ob,
res[i] = bb->res[i];
}
if (BKE_bvhtree_from_mesh_get(&tree_data, me, BVHTREE_FROM_LOOPTRI, 4)) {
/* Skip effector sampling loop if object has disabled effector. */
bool use_effector = fes->flags & FLUID_EFFECTOR_USE_EFFEC;
if (use_effector && BKE_bvhtree_from_mesh_get(&tree_data, me, BVHTREE_FROM_LOOPTRI, 4)) {
ObstaclesFromDMData data = {
.fes = fes,
@ -1174,13 +1176,11 @@ static void update_obstacleflags(FluidDomainSettings *fds,
static bool escape_effectorobject(Object *flowobj,
FluidDomainSettings *fds,
FluidEffectorSettings *fes,
FluidEffectorSettings *UNUSED(fes),
int frame)
{
bool is_static = is_static_object(flowobj);
bool use_effector = (fes->flags & FLUID_EFFECTOR_USE_EFFEC);
bool is_resume = (fds->cache_frame_pause_data == frame);
bool is_adaptive = (fds->flags & FLUID_DOMAIN_USE_ADAPTIVE_DOMAIN);
bool is_first_frame = (frame == fds->cache_frame_start);
@ -1190,10 +1190,6 @@ static bool escape_effectorobject(Object *flowobj,
if (is_adaptive) {
is_static = false;
}
/* Skip flow objects with disabled inflow flag. */
if (!use_effector) {
return true;
}
/* Skip static effector objects after initial frame. */
if (is_static && !is_first_frame && !is_resume) {
return true;
@ -2163,7 +2159,9 @@ static void emit_from_mesh(
res[i] = bb->res[i];
}
if (BKE_bvhtree_from_mesh_get(&tree_data, me, BVHTREE_FROM_LOOPTRI, 4)) {
/* Skip flow sampling loop if object has disabled flow. */
bool use_flow = ffs->flags & FLUID_FLOW_USE_INFLOW;
if (use_flow && BKE_bvhtree_from_mesh_get(&tree_data, me, BVHTREE_FROM_LOOPTRI, 4)) {
EmitFromDMData data = {
.fds = fds,
@ -2706,9 +2704,6 @@ static bool escape_flowsobject(Object *flowobj,
bool gas_flow = (ffs->type == FLUID_FLOW_TYPE_SMOKE || ffs->type == FLUID_FLOW_TYPE_FIRE ||
ffs->type == FLUID_FLOW_TYPE_SMOKEFIRE);
bool is_geometry = (ffs->behavior == FLUID_FLOW_BEHAVIOR_GEOMETRY);
bool is_inflow = (ffs->behavior == FLUID_FLOW_BEHAVIOR_INFLOW);
bool is_outflow = (ffs->behavior == FLUID_FLOW_BEHAVIOR_OUTFLOW);
bool use_flow = (ffs->flags & FLUID_FLOW_USE_INFLOW);
bool liquid_domain = fds->type == FLUID_DOMAIN_TYPE_LIQUID;
bool gas_domain = fds->type == FLUID_DOMAIN_TYPE_GAS;
@ -2721,10 +2716,6 @@ static bool escape_flowsobject(Object *flowobj,
if (is_adaptive) {
is_static = false;
}
/* Skip flow objects with disabled inflow flag. */
if ((is_inflow || is_outflow) && !use_flow) {
return true;
}
/* No need to compute emission value if it won't be applied. */
if (liquid_flow && is_geometry && !is_first_frame) {
return true;