diff options
author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-07-26 17:59:49 +0300 |
---|---|---|
committer | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-07-26 17:59:49 +0300 |
commit | 231b313c559b6a4969051e2f0fb978c59cf3d044 (patch) | |
tree | c99f0182fc6835ec14cf7d658d2e795552c285f3 /source/blender/makesdna | |
parent | 3059853732d7f42c42b9aa45e3f6379302d66eb4 (diff) |
Mantaflow: Remove Noise Type Option
Mantflow only supports wavelet noise, thus the parameter with only one option is no longer useful.
Differential Revision: https://developer.blender.org/D6770
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_fluid_defaults.h | 1 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_fluid_types.h | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_fluid_defaults.h b/source/blender/makesdna/DNA_fluid_defaults.h index 9454342654c..95f5b8b66b0 100644 --- a/source/blender/makesdna/DNA_fluid_defaults.h +++ b/source/blender/makesdna/DNA_fluid_defaults.h @@ -101,7 +101,6 @@ .noise_time_anim = 0.1f, \ .res_noise = {0, 0, 0}, \ .noise_scale = 2, \ - .noise_type = FLUID_NOISE_TYPE_WAVELET, \ .particle_randomness = 0.1f, \ .particle_number = 2, \ .particle_minimum = 8, \ diff --git a/source/blender/makesdna/DNA_fluid_types.h b/source/blender/makesdna/DNA_fluid_types.h index cec6eb0d044..57523f1c4d8 100644 --- a/source/blender/makesdna/DNA_fluid_types.h +++ b/source/blender/makesdna/DNA_fluid_types.h @@ -198,11 +198,6 @@ enum { FLUID_DOMAIN_TYPE_LIQUID = 1, }; -/* Smoke noise types. */ -enum { - FLUID_NOISE_TYPE_WAVELET = (1 << 0), -}; - /* Mesh levelset generator types. */ enum { FLUID_DOMAIN_MESH_IMPROVED = 0, @@ -580,8 +575,7 @@ typedef struct FluidDomainSettings { float noise_time_anim; int res_noise[3]; int noise_scale; - short noise_type; /* Noise type: wave, curl, anisotropic. */ - char _pad3[2]; /* Unused. */ + char _pad3[4]; /* Unused. */ /* Liquid domain options. */ float particle_randomness; |