diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-12-17 19:39:49 +0300 |
| commit | 42b0389a9b05e51e17ba79540e88cd446b52fae7 (patch) | |
| tree | ee17716640f1b1133ae2ab4ca65cd92a63d09f15 /source/blender/modifiers/intern/MOD_ocean.c | |
| parent | c5a17d5ea1ff786cb91cbcf3f12cd02f730c4143 (diff) | |
| parent | e7b698327cd91b371ff4fd43d1c117637224fded (diff) | |
Merge remote-tracking branch 'origin/master' into geometry-nodesgeometry-nodes
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 5aef497c0c4..9c940745920 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -736,7 +736,7 @@ ModifierTypeInfo modifierType_Ocean = { /* deformMatricesEM */ NULL, /* modifyMesh */ modifyMesh, /* modifyHair */ NULL, - /* modifyPointCloud */ NULL, + /* modifyGeometrySet */ NULL, /* modifyVolume */ NULL, /* initData */ initData, |