Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenkernel/intern/fluid.c
| Show First 20 Lines • Show All 3,104 Lines • ▼ Show 20 Lines | if ((mmd2->type & MOD_FLUID_TYPE_FLOW) && mmd2->flow) { | ||||
| color_r, | color_r, | ||||
| color_g_in, | color_g_in, | ||||
| color_g, | color_g, | ||||
| color_b_in, | color_b_in, | ||||
| color_b, | color_b, | ||||
| levelset, | levelset, | ||||
| emission_in); | emission_in); | ||||
| if (mfs->flags & FLUID_FLOW_INITVELOCITY) { | if (mfs->flags & FLUID_FLOW_INITVELOCITY) { | ||||
| velx_initial[d_index] = MAX2(velx_initial[d_index], velocity_map[e_index * 3]); | /* Use the initial velocity from the inflow object with the highest velocity for | ||||
| vely_initial[d_index] = MAX2(vely_initial[d_index], velocity_map[e_index * 3 + 1]); | * now. */ | ||||
| velz_initial[d_index] = MAX2(velz_initial[d_index], velocity_map[e_index * 3 + 2]); | float vel_initial[3]; | ||||
| vel_initial[0] = velx_initial[d_index]; | |||||
| vel_initial[1] = vely_initial[d_index]; | |||||
| vel_initial[2] = velz_initial[d_index]; | |||||
| float vel_initial_strength = len_squared_v3(vel_initial); | |||||
| float vel_map_strength = len_squared_v3(velocity_map + 3 * e_index); | |||||
| if (vel_map_strength > vel_initial_strength) { | |||||
| 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]; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| } /* End of flow emission map loop. */ | } /* End of flow emission map loop. */ | ||||
| bb_freeData(bb); | bb_freeData(bb); | ||||
| } /* End of flow object loop. */ | } /* End of flow object loop. */ | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 2,161 Lines • Show Last 20 Lines | |||||