blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fluid: Use maximum for initial velocity grid application 

Using MAX2 when writing intial velocities into the grid prevents overriding initial velocities when using multiple flow objects that are close to each other.
This commit is contained in:
Sebastián Barschkis 2020-04-22 15:00:52 +02:00
parent 8d5ae15040
commit a0fe22095e
Notes: blender-bot 2023-02-13 11:56:13 +01:00 
Referenced by commit 6524aaf685, Fix T76008: Fluid inflow with negative initial velocity is not working
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3110,9 +3110,9 @@ static void update_flowsfluids(struct Depsgraph *depsgraph,
levelset,
emission_in);
if (mfs->flags & FLUID_FLOW_INITVELOCITY) {
velx_initial[d_index] = velocity_map[e_index * 3];
vely_initial[d_index] = velocity_map[e_index * 3 + 1];
velz_initial[d_index] = velocity_map[e_index * 3 + 2];
velx_initial[d_index] = MAX2(velx_initial[d_index], velocity_map[e_index * 3]);
vely_initial[d_index] = MAX2(vely_initial[d_index], velocity_map[e_index * 3 + 1]);
velz_initial[d_index] = MAX2(velz_initial[d_index], velocity_map[e_index * 3 + 2]);
}
}
}