diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-21 01:01:09 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-09-21 01:35:46 +0300 |
| commit | 7926e8ea4c11e55c56b1d051e9ccb68dbfddb58b (patch) | |
| tree | 500317d9bc743835c8262bc308ef586b069154ea /source/blender/modifiers/intern/MOD_ocean.c | |
| parent | bf14e323e67f5cc7721a088bc8ea5fe00f2f7296 (diff) | |
Revert "Modifiers: every modifier now copies mesh settings, fixing texture space issues"
This reverts commit e7a514369fe700dcc5a1fe433c8f709ed9595ded, it introduces
a bug in selection in edit mode.
Fixes T70103: can't select extruded Vertex
Ref T64739
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 97be42367d4..aff5b8b071b 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -268,7 +268,7 @@ static void generate_ocean_geometry_uvs(void *__restrict userdata, } } -static Mesh *generate_ocean_geometry(OceanModifierData *omd, Mesh *mesh_orig) +static Mesh *generate_ocean_geometry(OceanModifierData *omd) { Mesh *result; @@ -296,7 +296,6 @@ static Mesh *generate_ocean_geometry(OceanModifierData *omd, Mesh *mesh_orig) gogd.sy /= gogd.ry; result = BKE_mesh_new_nomain(num_verts, 0, 0, num_polys * 4, num_polys); - BKE_mesh_copy_settings(result, mesh_orig); gogd.mverts = result->mvert; gogd.mpolys = result->mpoly; @@ -378,7 +377,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes } if (omd->geometry_mode == MOD_OCEAN_GEOM_GENERATE) { - result = generate_ocean_geometry(omd, mesh); + result = generate_ocean_geometry(omd); BKE_mesh_ensure_normals(result); } else if (omd->geometry_mode == MOD_OCEAN_GEOM_DISPLACE) { |