diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_object_fluidsim_types.h | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_object_fluidsim_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index b305235083a..b8927613a59 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -38,14 +38,14 @@ #ifdef __cplusplus extern "C" { #endif - + struct Mesh; struct Ipo; typedef struct FluidVertexVelocity { float vel[3]; } FluidVertexVelocity; - + typedef struct FluidsimSettings { struct FluidsimModifierData *fmd; /* for fast RNA access */ /* threadcont the calculation is done with */ @@ -83,7 +83,7 @@ typedef struct FluidsimSettings { float gstar; /* activate refinement? */ int maxRefine; - + /* fluid object type settings */ /* gravity strength */ float iniVelx, iniVely, iniVelz; @@ -127,19 +127,19 @@ typedef struct FluidsimSettings { struct FluidVertexVelocity *meshVelocities; /* number of vertices in simulated fluid mesh */ int totvert; - + /* Fluid control settings */ float cpsTimeStart; float cpsTimeEnd; float cpsQuality; - + float attractforceStrength; float attractforceRadius; float velocityforceStrength; float velocityforceRadius; int lastgoodframe; - + /* Simulation/flow rate control (i.e. old "Fac-Time") */ float animRate; } FluidsimSettings; |