1 files changed, 9 insertions, 11 deletions

diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index ea8e534f585..cca49b42208 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -273,9 +273,9 @@ static Mesh *generate_ocean_geometry(OceanModifierData *omd, Mesh *mesh_orig, co
   result = BKE_mesh_new_nomain(verts_num, 0, 0, polys_num * 4, polys_num);
   BKE_mesh_copy_parameters_for_eval(result, mesh_orig);
 
-  gogd.mverts = result->mvert;
-  gogd.mpolys = result->mpoly;
-  gogd.mloops = result->mloop;
+  gogd.mverts = BKE_mesh_vertices_for_write(result);
+  gogd.mpolys = BKE_mesh_polygons_for_write(result);
+  gogd.mloops = BKE_mesh_loops_for_write(result);
 
   TaskParallelSettings settings;
   BLI_parallel_range_settings_defaults(&settings);
@@ -322,8 +322,6 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
   const int resolution = (ctx->flag & MOD_APPLY_RENDER) ? omd->resolution :
                                                           omd->viewport_resolution;
 
-  MVert *mverts;
-
   int cfra_for_cache;
   int i, j;
 
@@ -368,14 +366,15 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
   CLAMP(cfra_for_cache, omd->bakestart, omd->bakeend);
   cfra_for_cache -= omd->bakestart; /* shift to 0 based */
 
-  mverts = result->mvert;
+  MVert *verts = BKE_mesh_vertices_for_write(result);
+  MPoly *polys = BKE_mesh_polygons_for_write(result);
 
   /* add vcols before displacement - allows lookup based on position */
 
   if (omd->flag & MOD_OCEAN_GENERATE_FOAM) {
     const int polys_num = result->totpoly;
     const int loops_num = result->totloop;
-    MLoop *mloops = result->mloop;
+    MLoop *mloops = BKE_mesh_loops_for_write(result);
     MLoopCol *mloopcols = CustomData_add_layer_named(
         &result->ldata, CD_PROP_BYTE_COLOR, CD_SET_DEFAULT, NULL, loops_num, omd->foamlayername);
 
@@ -390,10 +389,9 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
     }
 
     if (mloopcols) { /* unlikely to fail */
-      MPoly *mpolys = result->mpoly;
       MPoly *mp;
 
-      for (i = 0, mp = mpolys; i < polys_num; i++, mp++) {
+      for (i = 0, mp = polys; i < polys_num; i++, mp++) {
         MLoop *ml = &mloops[mp->loopstart];
         MLoopCol *mlcol = &mloopcols[mp->loopstart];
 
@@ -403,7 +401,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
         }
 
         for (j = mp->totloop; j--; ml++, mlcol++) {
-          const float *vco = mverts[ml->v].co;
+          const float *vco = verts[ml->v].co;
           const float u = OCEAN_CO(size_co_inv, vco[0]);
           const float v = OCEAN_CO(size_co_inv, vco[1]);
           float foam;
@@ -451,7 +449,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
     const int verts_num = result->totvert;
 
     for (i = 0; i < verts_num; i++) {
-      float *vco = mverts[i].co;
+      float *vco = verts[i].co;
       const float u = OCEAN_CO(size_co_inv, vco[0]);
       const float v = OCEAN_CO(size_co_inv, vco[1]);