diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-05 17:23:35 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-10 13:00:58 +0300 |
commit | de55ae56ae5d871b5bc7fa6383c90ef89d66fcd1 (patch) | |
tree | 212fc7b15f9523bcc7a1a54906f1ba6bb6006a4f /source/blender/makesdna | |
parent | b9bef10d1953bda4e1eb882bdc525815c2e32e01 (diff) |
Ocean Modifier: refactored the delayed-refresh approach
The approach of setting 'refresh' flags on the modifier, and performing
the associated actions when the modifier is being evaluated, is a bad
one. Instead, we use the separation of the original and the evaluated
copy to 'refresh' certain things (because they simply aren't set at all
on the original). Other actions are now done directly with BKE_ocean_xxx
functions on the original data, intead of during evaluation.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index ed25727b740..ecece648ce1 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -997,7 +997,7 @@ typedef struct OceanModifierData { char geometry_mode; char flag; - char refresh; + char pad2; short repeat_x; short repeat_y; @@ -1017,13 +1017,6 @@ enum { MOD_OCEAN_GEOM_SIM_ONLY = 2, }; -enum { - MOD_OCEAN_REFRESH_RESET = (1 << 0), - /* MOD_OCEAN_REFRESH_SIM = (1 << 1), */ - /* MOD_OCEAN_REFRESH_ADD = (1 << 2), */ - MOD_OCEAN_REFRESH_CLEAR_CACHE = (1 << 3), - /* MOD_OCEAN_REFRESH_TOPOLOGY = (1 << 4), */ -}; enum { MOD_OCEAN_GENERATE_FOAM = (1 << 0), |