Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-12-12 17:06:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-12-12 17:07:03 +0300
commitb60aedc14c3d67955ea7ebb55edf87899339cb53 (patch)
treeb990253d4bd7ff1480e9c34a5b10759e1edc9a87 /source/blender/blenkernel/intern/customdata.c
parent879e5cde64164a1e02203424cb8e7b41d32fd745 (diff)
Fix T58450: Skin modifier not working if applied after subsurf
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
-rw-r--r--source/blender/blenkernel/intern/customdata.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 84864411360..64a3cbe0935 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1194,6 +1194,12 @@ static void layerDefault_mvert_skin(void *data, int count)
}
}
+static void layerCopy_mvert_skin(const void *source, void *dest,
+ int count)
+{
+ memcpy(dest, source, sizeof (MVertSkin) * count);
+}
+
static void layerInterp_mvert_skin(
const void **sources, const float *weights,
const float *UNUSED(sub_weights),
@@ -1342,7 +1348,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
{sizeof(GridPaintMask), "GridPaintMask", 1, NULL, layerCopy_grid_paint_mask,
layerFree_grid_paint_mask, NULL, NULL, NULL},
/* 36: CD_MVERT_SKIN */
- {sizeof(MVertSkin), "MVertSkin", 1, NULL, NULL, NULL,
+ {sizeof(MVertSkin), "MVertSkin", 1, NULL, layerCopy_mvert_skin, NULL,
layerInterp_mvert_skin, NULL, layerDefault_mvert_skin},
/* 37: CD_FREESTYLE_EDGE */
{sizeof(FreestyleEdge), "FreestyleEdge", 1, NULL, NULL, NULL, NULL, NULL, NULL},