diff options
| author | Sebastián Barschkis <sebbas@sebbas.org> | 2020-04-30 16:55:35 +0300 |
|---|---|---|
| committer | Sebastián Barschkis <sebbas@sebbas.org> | 2020-04-30 16:55:35 +0300 |
| commit | dc0a564c0616e181e06cd4f38b6c0920ea9e2348 (patch) | |
| tree | 8aeae3a81bff63a8f32b3d9a73b8201189000d90 /source/blender/makesdna | |
| parent | 7163e159c54524a34ca4bc96d37cd778d7b19822 (diff) | |
| parent | 9ee7fc15afdaf2649ecae1478fe6ad3ad89af325 (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_fluid_types.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h index 166b3c22932..6583aa2eeee 100644 --- a/source/blender/makesdna/DNA_fluid_types.h +++ b/source/blender/makesdna/DNA_fluid_types.h @@ -393,7 +393,6 @@ typedef struct FluidDomainSettings { float surface_tension; float viscosity_base; int viscosity_exponent; - float domain_size; /* Mesh options. */ float mesh_concave_upper; @@ -404,7 +403,7 @@ typedef struct FluidDomainSettings { int mesh_scale; int totvert; short mesh_generator; - char _pad5[2]; /* Unused. */ + char _pad5[6]; /* Unused. */ /* Secondary particle options. */ int particle_type; |