diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-28 20:39:58 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-28 20:39:58 +0300 |
| commit | 14deacdc22875c87ce2005a21d99257a03da738f (patch) | |
| tree | aaa9e146403373a1e2ca844478a176f8d9cc308d /source/blender/makesdna | |
| parent | b7075049732a0df53be6483ab5fc2333398b9ebb (diff) | |
| parent | b2034c6ba245e131e6ecabe33ca9afa1e6394247 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_defaults.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_object_defaults.h b/source/blender/makesdna/DNA_object_defaults.h index 1105a8fd4e1..554d68f2d4a 100644 --- a/source/blender/makesdna/DNA_object_defaults.h +++ b/source/blender/makesdna/DNA_object_defaults.h @@ -66,7 +66,6 @@ .col_mask = 0xffff, \ .preview = NULL, \ .duplicator_visibility_flag = OB_DUPLI_FLAG_VIEWPORT | OB_DUPLI_FLAG_RENDER, \ - .fluidsimSettings = NULL, \ .pc_ids = {NULL, NULL}, \ } |