diff options
author | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 17:50:14 +0300 |
---|---|---|
committer | Sebastián Barschkis <sebbas@sebbas.org> | 2019-12-16 18:37:01 +0300 |
commit | d27ccf990c2b957a10f4676e3153f907829a4b22 (patch) | |
tree | 48667db9d5f51e3c951cb1106566a53db21d9adf /source/blender/makesdna/DNA_modifier_types.h | |
parent | 7b87d3d34ec5bbaf777bdc27abdb69600915fce1 (diff) |
Mantaflow [Part 6]: Updates in /blender/source
A collection of smaller changes that are required in the /blender/source files. A lot of them are also due to variable renaming.
Reviewed By: sergey
Maniphest Tasks: T59995
Differential Revision: https://developer.blender.org/D3855
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 0b61e312846..020325b49f7 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -87,6 +87,7 @@ typedef enum ModifierType { eModifierType_SurfaceDeform = 53, eModifierType_WeightedNormal = 54, eModifierType_Weld = 55, + eModifierType_Fluid = 56, NUM_MODIFIER_TYPES, } ModifierType; @@ -451,24 +452,24 @@ enum { MOD_BEVEL_VMESH_CUTOFF, }; -typedef struct SmokeModifierData { +typedef struct FluidModifierData { ModifierData modifier; - struct SmokeDomainSettings *domain; + struct FluidDomainSettings *domain; /** Inflow, outflow, smoke objects. */ - struct SmokeFlowSettings *flow; - /** Collision objects. */ - struct SmokeCollSettings *coll; + struct FluidFlowSettings *flow; + /** Effector objects (collision, guiding). */ + struct FluidEffectorSettings *effector; float time; /** Domain, inflow, outflow, .... */ int type; -} SmokeModifierData; +} FluidModifierData; -/* Smoke modifier flags */ +/* Fluid modifier flags */ enum { - MOD_SMOKE_TYPE_DOMAIN = (1 << 0), - MOD_SMOKE_TYPE_FLOW = (1 << 1), - MOD_SMOKE_TYPE_COLL = (1 << 2), + MOD_FLUID_TYPE_DOMAIN = (1 << 0), + MOD_FLUID_TYPE_FLOW = (1 << 1), + MOD_FLUID_TYPE_EFFEC = (1 << 2), }; typedef struct DisplaceModifierData { @@ -977,6 +978,7 @@ typedef enum { eMultiresModifierFlag_UseCrease = (1 << 2), } MultiresModifierFlag; +/* DEPRECATED, only used for versioning. */ typedef struct FluidsimModifierData { ModifierData modifier; @@ -984,6 +986,11 @@ typedef struct FluidsimModifierData { struct FluidsimSettings *fss; } FluidsimModifierData; +/* DEPRECATED, only used for versioning. */ +typedef struct SmokeModifierData { + ModifierData modifier; +} SmokeModifierData; + typedef struct ShrinkwrapModifierData { ModifierData modifier; |