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

Merge branch 'blender-v2.90-release'

This commit is contained in:
Sebastián Barschkis 2020-08-03 12:40:06 +02:00
parent db5915d863 33e6562a8a
commit 3c9cb62d82
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/makesrna/intern/rna_fluid.c
View File

@ -1024,14 +1024,18 @@ static void rna_Fluid_flowtype_set(struct PointerRNA *ptr, int value)
FluidFlowSettings *settings = (FluidFlowSettings *)ptr->data;
if (value != settings->type) {
short prev_value = settings->type;
settings->type = value;
/* Force flow source to mesh */
/* Force flow source to mesh for liquids.
* Also use different surface emission. Liquids should by default not emit around surface. */
if (value == FLUID_FLOW_TYPE_LIQUID) {
rna_Fluid_flowsource_set(ptr, FLUID_FLOW_SOURCE_MESH);
settings->surface_distance = 0.0f;
}
else {
/* Use some surface emission when switching to a gas emitter. Gases should by default emit a
* bit around surface. */
if (prev_value == FLUID_FLOW_TYPE_LIQUID) {
settings->surface_distance = 1.5f;
}
}