diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-06 14:53:35 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-06 14:53:35 +0300 |
| commit | 843d5d707deec1c58534c879dca23c03bd64f249 (patch) | |
| tree | 19976afafde93b0284a1d1ae39f94c0231f25abe /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 81a93df6d22c2f148667b9a6e8308e083a4cec39 (diff) | |
| parent | 12ce0cfb21d83b70183a64de47ad05b5775b4937 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 42b22e45495..ed25727b740 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1019,10 +1019,10 @@ enum { enum { MOD_OCEAN_REFRESH_RESET = (1 << 0), - MOD_OCEAN_REFRESH_SIM = (1 << 1), - MOD_OCEAN_REFRESH_ADD = (1 << 2), + /* 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), + /* MOD_OCEAN_REFRESH_TOPOLOGY = (1 << 4), */ }; enum { |