1 files changed, 17 insertions, 14 deletions

diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 5f238209015..ae8fcb42553 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -889,9 +889,9 @@ static Mesh *subdivide_base(const Mesh *orig)
   float radrat;
 
   const MVertSkin *orignode = CustomData_get_layer(&orig->vdata, CD_MVERT_SKIN);
-  const MVert *origvert = orig->mvert;
-  const MEdge *origedge = orig->medge;
-  const MDeformVert *origdvert = orig->dvert;
+  const MVert *origvert = BKE_mesh_verts(orig);
+  const MEdge *origedge = BKE_mesh_edges(orig);
+  const MDeformVert *origdvert = BKE_mesh_deform_verts(orig);
   int orig_vert_num = orig->totvert;
   int orig_edge_num = orig->totedge;
 
@@ -916,10 +916,13 @@ static Mesh *subdivide_base(const Mesh *orig)
   Mesh *result = BKE_mesh_new_nomain_from_template(
       orig, orig_vert_num + subd_num, orig_edge_num + subd_num, 0, 0, 0);
 
-  MVert *outvert = result->mvert;
-  MEdge *outedge = result->medge;
+  MVert *outvert = BKE_mesh_verts_for_write(result);
+  MEdge *outedge = BKE_mesh_edges_for_write(result);
   MVertSkin *outnode = CustomData_get_layer(&result->vdata, CD_MVERT_SKIN);
-  MDeformVert *outdvert = result->dvert;
+  MDeformVert *outdvert = NULL;
+  if (origdvert) {
+    outdvert = BKE_mesh_deform_verts_for_write(result);
+  }
 
   /* Copy original vertex data */
   CustomData_copy_data(&orig->vdata, &result->vdata, 0, 0, orig_vert_num);
@@ -1888,7 +1891,7 @@ static void skin_set_orig_indices(Mesh *mesh)
   int *orig, totpoly;
 
   totpoly = mesh->totpoly;
-  orig = CustomData_add_layer(&mesh->pdata, CD_ORIGINDEX, CD_CALLOC, NULL, totpoly);
+  orig = CustomData_add_layer(&mesh->pdata, CD_ORIGINDEX, CD_CONSTRUCT, NULL, totpoly);
   copy_vn_i(orig, totpoly, ORIGINDEX_NONE);
 }
 
@@ -1907,17 +1910,17 @@ static Mesh *base_skin(Mesh *origmesh, SkinModifierData *smd, eSkinErrorFlag *r_
   SkinNode *skin_nodes;
   MeshElemMap *emap;
   int *emapmem;
-  MVert *mvert;
-  MEdge *medge;
-  MDeformVert *dvert;
+  const MVert *mvert;
+  const MEdge *medge;
+  const MDeformVert *dvert;
   int verts_num, edges_num;
   bool has_valid_root = false;
 
   nodes = CustomData_get_layer(&origmesh->vdata, CD_MVERT_SKIN);
 
-  mvert = origmesh->mvert;
-  dvert = origmesh->dvert;
-  medge = origmesh->medge;
+  mvert = BKE_mesh_verts(origmesh);
+  dvert = BKE_mesh_deform_verts(origmesh);
+  medge = BKE_mesh_edges(origmesh);
   verts_num = origmesh->totvert;
   edges_num = origmesh->totedge;
 
@@ -2069,7 +2072,7 @@ static void panelRegister(ARegionType *region_type)
 }
 
 ModifierTypeInfo modifierType_Skin = {
-    /* name */ "Skin",
+    /* name */ N_("Skin"),
     /* structName */ "SkinModifierData",
     /* structSize */ sizeof(SkinModifierData),
     /* srna */ &RNA_SkinModifier,