[Bf-blender-cvs] [c67adabdba9] hair_guides: Fix changed signature of applyModifier callback.

Lukas Tönne noreply at git.blender.org
Mon May 7 10:58:51 CEST 2018


Commit: c67adabdba96b2c05cba265d152789f496165e41
Author: Lukas Tönne
Date:   Mon May 7 09:58:29 2018 +0100
Branches: hair_guides
https://developer.blender.org/rBc67adabdba96b2c05cba265d152789f496165e41

Fix changed signature of applyModifier callback.

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

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

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

diff --git a/source/blender/modifiers/intern/MOD_fur.c b/source/blender/modifiers/intern/MOD_fur.c
index f49f7a602dd..9a572eb59a6 100644
--- a/source/blender/modifiers/intern/MOD_fur.c
+++ b/source/blender/modifiers/intern/MOD_fur.c
@@ -110,15 +110,14 @@ static void freeData(ModifierData *md)
 	BLI_freelistN(&fmd->guide_curves);
 }
 
-static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationContext *UNUSED(eval_ctx),
-                                  Object *UNUSED(ob), DerivedMesh *dm,
-                                  ModifierApplyFlag UNUSED(flag))
+static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
+                                  DerivedMesh *derivedData)
 {
 	FurModifierData *fmd = (FurModifierData *) md;
 	
-	UNUSED_VARS(fmd);
+	UNUSED_VARS(fmd, ctx);
 	
-	return dm;
+	return derivedData;
 }
 
 static void foreachObjectLink(



More information about the Bf-blender-cvs mailing list