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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-05-08 16:20:18 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-05-08 16:20:18 +0300
commit53a56b7b6c169b21df475ae94795208501581489 (patch)
tree011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_skin.c
parentd89f9d70c52001e09ee3ab80a3547ba140e00aec (diff)
parent3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_skin.c')
-rw-r--r--source/blender/modifiers/intern/MOD_skin.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c
index 1e02ad40e12..ec7a9958109 100644
--- a/source/blender/modifiers/intern/MOD_skin.c
+++ b/source/blender/modifiers/intern/MOD_skin.c
@@ -1905,15 +1905,6 @@ static void initData(ModifierData *md)
smd->symmetry_axes = MOD_SKIN_SYMM_X;
}
-static void copyData(ModifierData *md, ModifierData *target)
-{
-#if 0
- SkinModifierData *smd = (SkinModifierData *) md;
- SkinModifierData *tsmd = (SkinModifierData *) target;
-#endif
- modifier_copyData_generic(md, target);
-}
-
static Mesh *applyModifier(ModifierData *md,
const ModifierEvalContext *UNUSED(ctx),
Mesh *mesh)
@@ -1938,7 +1929,7 @@ ModifierTypeInfo modifierType_Skin = {
/* type */ eModifierTypeType_Constructive,
/* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
/* deformVerts_DM */ NULL,
/* deformMatrices_DM */ NULL,