From 4a4f091155e7fb1c7eba0988c815b41665e045b6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 2 May 2013 14:42:05 +0000 Subject: Fix #35174: dynamic paint displacement missing in render. A previous bugfix disabled the dynamic paint modifier for orco texture coordinate evaluation of the modifier stack. However the MOD_APPLY_USECACHE flag is not a good way to check if the modifier is evaluated for orcos. Instead I've added a MOD_APPLY_ORCO flag. Also removed a bunch of applyModifierEM callbacks, none of them served a purpose except for the subsurf modifier. --- source/blender/modifiers/intern/MOD_triangulate.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_triangulate.c') diff --git a/source/blender/modifiers/intern/MOD_triangulate.c b/source/blender/modifiers/intern/MOD_triangulate.c index e99b4adfdf6..59973fe77a8 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.c +++ b/source/blender/modifiers/intern/MOD_triangulate.c @@ -78,20 +78,6 @@ static void copyData(ModifierData *md, ModifierData *target) *tsmd = *smd; } -static DerivedMesh *applyModifierEM(ModifierData *md, - Object *UNUSED(ob), - struct BMEditMesh *UNUSED(em), - DerivedMesh *dm) -{ - TriangulateModifierData *tmd = (TriangulateModifierData *)md; - DerivedMesh *result; - if (!(result = triangulate_dm(dm, tmd->flag))) { - return dm; - } - - return result; -} - static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), DerivedMesh *dm, @@ -123,7 +109,7 @@ ModifierTypeInfo modifierType_Triangulate = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, //requiredDataMask, /* freeData */ NULL, -- cgit v1.2.3