diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-08 16:20:18 +0300 |
commit | 53a56b7b6c169b21df475ae94795208501581489 (patch) | |
tree | 011410b7ff5488b5b9d57029ed576929e770bceb /source/blender/modifiers/intern/MOD_laplaciansmooth.c | |
parent | d89f9d70c52001e09ee3ab80a3547ba140e00aec (diff) | |
parent | 3740f7593d7146135c2d2fac363f8aed4ba41cf0 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_laplaciansmooth.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciansmooth.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 3b63a3ef5f8..b683003baad 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -81,7 +81,6 @@ static CustomDataMask required_data_mask(Object *ob, ModifierData *md); static bool is_disabled(ModifierData *md, int useRenderParams); static float compute_volume(const float center[3], float (*vertexCos)[3], const MPoly *mpoly, int numPolys, const MLoop *mloop); static LaplacianSystem *init_laplacian_system(int a_numEdges, int a_numPolys, int a_numLoops, int a_numVerts); -static void copy_data(ModifierData *md, ModifierData *target); static void delete_laplacian_system(LaplacianSystem *sys); static void fill_laplacian_matrix(LaplacianSystem *sys); static void init_data(ModifierData *md); @@ -472,16 +471,6 @@ static void init_data(ModifierData *md) smd->defgrp_name[0] = '\0'; } -static void copy_data(ModifierData *md, ModifierData *target) -{ -#if 0 - LaplacianSmoothModifierData *smd = (LaplacianSmoothModifierData *) md; - LaplacianSmoothModifierData *tsmd = (LaplacianSmoothModifierData *) target; -#endif - - modifier_copyData_generic(md, target); -} - static bool is_disabled(ModifierData *md, int UNUSED(useRenderParams)) { LaplacianSmoothModifierData *smd = (LaplacianSmoothModifierData *) md; @@ -550,7 +539,7 @@ ModifierTypeInfo modifierType_LaplacianSmooth = { /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, - /* copy_data */ copy_data, + /* copyData */ modifier_copyData_generic, /* deformVerts_DM */ deformVerts, /* deformMatrices_DM */ NULL, |