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:04:10 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-05-08 16:04:10 +0300
commit3740f7593d7146135c2d2fac363f8aed4ba41cf0 (patch)
tree73b7c69eca3db4a8b1337588d36dd18b7b4d9cc8 /source/blender/modifiers/intern/MOD_displace.c
parent49fe27ee46b4d9272957c21c13365db322ca8396 (diff)
Cleanup: Nuke empty dummy wrappers around modifier_copyData_generic().
This also changes signature of modifier copy callback, first (source) parameter is now a const, which is saner anyway!
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
-rw-r--r--source/blender/modifiers/intern/MOD_displace.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 72122fae6b4..e63d015ac9a 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -71,16 +71,6 @@ static void initData(ModifierData *md)
dmd->space = MOD_DISP_SPACE_LOCAL;
}
-static void copyData(ModifierData *md, ModifierData *target)
-{
-#if 0
- DisplaceModifierData *dmd = (DisplaceModifierData *) md;
- DisplaceModifierData *tdmd = (DisplaceModifierData *) target;
-#endif
-
- modifier_copyData_generic(md, target);
-}
-
static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
{
DisplaceModifierData *dmd = (DisplaceModifierData *)md;
@@ -427,7 +417,7 @@ ModifierTypeInfo modifierType_Displace = {
/* flags */ eModifierTypeFlag_AcceptsMesh |
eModifierTypeFlag_SupportsEditmode,
- /* copyData */ copyData,
+ /* copyData */ modifier_copyData_generic,
/* deformVerts */ deformVerts,
/* deformMatrices */ NULL,
/* deformVertsEM */ deformVertsEM,