[Bf-blender-cvs] [52cfd0e] master: Fix T44879, data transfer modifier was missing a copy function

Antony Riakiotakis noreply at git.blender.org
Fri May 29 11:39:17 CEST 2015


Commit: 52cfd0eef8de4e5cef435c9e002c308881bed1da
Author: Antony Riakiotakis
Date:   Fri May 29 11:38:57 2015 +0200
Branches: master
https://developer.blender.org/rB52cfd0eef8de4e5cef435c9e002c308881bed1da

Fix T44879, data transfer modifier was missing a copy function

===================================================================

M	source/blender/modifiers/intern/MOD_datatransfer.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 57d119f..e133c47 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -225,6 +225,15 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der
 #undef HIGH_POLY_WARNING
 #undef DT_TYPES_AFFECT_MESH
 
+static void copyData(ModifierData *md, ModifierData *target)
+{
+#if 0
+	DataTransferModifierData *dtmd = (DecimateModifierData *) md;
+	DataTransferModifierData *tdtmd = (DecimateModifierData *) target;
+#endif
+	modifier_copyData_generic(md, target);
+}
+
 ModifierTypeInfo modifierType_DataTransfer = {
 	/* name */              "DataTransfer",
 	/* structName */        "DataTransferModifierData",
@@ -235,7 +244,7 @@ ModifierTypeInfo modifierType_DataTransfer = {
 	                        eModifierTypeFlag_SupportsEditmode |
 	                        eModifierTypeFlag_UsesPreview,
 
-	/* copyData */          NULL,
+	/* copyData */          copyData,
 	/* deformVerts */       NULL,
 	/* deformMatrices */    NULL,
 	/* deformVertsEM */     NULL,




More information about the Bf-blender-cvs mailing list