diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:59:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-30 01:59:47 +0400 |
| commit | 2ea8a3b8cafb5ff7e88b08927fd8f5670ce5017e (patch) | |
| tree | efb6dc93c633ac5ba55ce846ffd426104293c476 /source/blender/modifiers/intern/MOD_ocean.c | |
| parent | 870aa901120fc8db499f9bea3a9a86006ef4cc3a (diff) | |
remove CDDM_copy second argument, added CDDM_copy_from_tessface instead.
this function caused too many conflicts and in most cases was zero anyway.
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 296e377f6fa..b3553c04cf4 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -437,7 +437,7 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob, if (omd->geometry_mode == MOD_OCEAN_GEOM_GENERATE) dm = generate_ocean_geometry(omd); else if (omd->geometry_mode == MOD_OCEAN_GEOM_DISPLACE) { - dm = CDDM_copy(derivedData, 0); + dm = CDDM_copy(derivedData); } cfra = md->scene->r.cfra; |