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:
authorCampbell Barton <ideasman42@gmail.com>2013-12-21 21:35:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-12-21 21:37:26 +0400
commit158b4e61a050a25fec47a00797ab7db46fc3198c (patch)
tree8685bf78c15dc0b65477a5d6b7da29c40b599caa /source/blender/modifiers/intern/MOD_displace.c
parent87cc890aef53c4660448b1125dc0c40a187ae1f2 (diff)
Mesh Modifiers: refactor copying using a generic function
Diffstat (limited to 'source/blender/modifiers/intern/MOD_displace.c')
-rw-r--r--source/blender/modifiers/intern/MOD_displace.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 61f5495bee8..54f2e688f31 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -69,17 +69,12 @@ static void initData(ModifierData *md)
static void copyData(ModifierData *md, ModifierData *target)
{
+#if 0
DisplaceModifierData *dmd = (DisplaceModifierData *) md;
+#endif
DisplaceModifierData *tdmd = (DisplaceModifierData *) target;
- tdmd->texture = dmd->texture;
- tdmd->strength = dmd->strength;
- tdmd->direction = dmd->direction;
- BLI_strncpy(tdmd->defgrp_name, dmd->defgrp_name, sizeof(tdmd->defgrp_name));
- tdmd->midlevel = dmd->midlevel;
- tdmd->texmapping = dmd->texmapping;
- tdmd->map_object = dmd->map_object;
- BLI_strncpy(tdmd->uvlayer_name, dmd->uvlayer_name, sizeof(tdmd->uvlayer_name));
+ modifier_copyData_generic(md, target);
if (tdmd->texture) {
id_us_plus(&tdmd->texture->id);