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/blenkernel/BKE_modifier.h | 7 +++++-- source/blender/blenkernel/intern/DerivedMesh.c | 12 ++++++------ source/blender/blenkernel/intern/displist.c | 6 ++++-- source/blender/modifiers/intern/MOD_array.c | 9 +-------- source/blender/modifiers/intern/MOD_bevel.c | 9 +-------- source/blender/modifiers/intern/MOD_dynamicpaint.c | 2 +- source/blender/modifiers/intern/MOD_edgesplit.c | 9 +-------- source/blender/modifiers/intern/MOD_mirror.c | 9 +-------- source/blender/modifiers/intern/MOD_ocean.c | 10 +--------- source/blender/modifiers/intern/MOD_particleinstance.c | 9 +-------- source/blender/modifiers/intern/MOD_screw.c | 12 +----------- source/blender/modifiers/intern/MOD_skin.c | 14 +------------- source/blender/modifiers/intern/MOD_solidify.c | 10 +--------- source/blender/modifiers/intern/MOD_subsurf.c | 3 ++- source/blender/modifiers/intern/MOD_triangulate.c | 16 +--------------- source/blender/modifiers/intern/MOD_uvproject.c | 9 +-------- source/blender/modifiers/intern/MOD_uvwarp.c | 9 +-------- source/blender/modifiers/intern/MOD_weightvgedit.c | 9 +-------- source/blender/modifiers/intern/MOD_weightvgmix.c | 9 +-------- source/blender/modifiers/intern/MOD_weightvgproximity.c | 9 +-------- 20 files changed, 33 insertions(+), 149 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index cf79aaff55c..955df65d00d 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -111,7 +111,9 @@ typedef void (*TexWalkFunc)(void *userData, struct Object *ob, struct ModifierDa typedef enum ModifierApplyFlag { MOD_APPLY_RENDER = 1 << 0, /* Render time. */ - MOD_APPLY_USECACHE = 1 << 1, /* Final result. Is not set for temporary calculations like orco dms. */ + MOD_APPLY_USECACHE = 1 << 1, /* Result of evaluation will be cached, so modifier might + * want to cache data for quick updates (used by subsurf) */ + MOD_APPLY_ORCO = 1 << 2 /* Modifier evaluated for undeformed texture coordinates */ } ModifierApplyFlag; @@ -200,7 +202,8 @@ typedef struct ModifierTypeInfo { */ struct DerivedMesh *(*applyModifierEM)(struct ModifierData *md, struct Object *ob, struct BMEditMesh *editData, - struct DerivedMesh *derivedData); + struct DerivedMesh *derivedData, + ModifierApplyFlag flag); /********************* Optional functions *********************/ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index e188a7b403b..ebe032ad827 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -1692,7 +1692,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos DM_set_only_copy(orcodm, nextmask | CD_MASK_ORIGINDEX | (mti->requiredDataMask ? mti->requiredDataMask(ob, md) : 0)); - ndm = mti->applyModifier(md, ob, orcodm, app_flags & ~MOD_APPLY_USECACHE); + ndm = mti->applyModifier(md, ob, orcodm, (app_flags & ~MOD_APPLY_USECACHE) | MOD_APPLY_ORCO); if (ndm) { /* if the modifier returned a new dm, release the old one */ @@ -1708,7 +1708,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos nextmask &= ~CD_MASK_CLOTH_ORCO; DM_set_only_copy(clothorcodm, nextmask | CD_MASK_ORIGINDEX); - ndm = mti->applyModifier(md, ob, clothorcodm, app_flags & ~MOD_APPLY_USECACHE); + ndm = mti->applyModifier(md, ob, clothorcodm, (app_flags & ~MOD_APPLY_USECACHE) | MOD_APPLY_ORCO); if (ndm) { /* if the modifier returned a new dm, release the old one */ @@ -2031,9 +2031,9 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D DM_set_only_copy(orcodm, mask | CD_MASK_ORIGINDEX); if (mti->applyModifierEM) - ndm = mti->applyModifierEM(md, ob, em, orcodm); + ndm = mti->applyModifierEM(md, ob, em, orcodm, MOD_APPLY_ORCO); else - ndm = mti->applyModifier(md, ob, orcodm, 0); + ndm = mti->applyModifier(md, ob, orcodm, MOD_APPLY_ORCO); if (ndm) { /* if the modifier returned a new dm, release the old one */ @@ -2055,9 +2055,9 @@ static void editbmesh_calc_modifiers(Scene *scene, Object *ob, BMEditMesh *em, D } if (mti->applyModifierEM) - ndm = mti->applyModifierEM(md, ob, em, dm); + ndm = mti->applyModifierEM(md, ob, em, dm, MOD_APPLY_USECACHE); else - ndm = mti->applyModifier(md, ob, dm, 0); + ndm = mti->applyModifier(md, ob, dm, MOD_APPLY_USECACHE); if (ndm) { if (dm && dm != ndm) diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index b47b404dfe0..97923d23fb1 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1132,10 +1132,12 @@ static void curve_calc_orcodm(Scene *scene, Object *ob, DerivedMesh *derivedFina int required_mode; int editmode = (!forRender && (cu->editnurb || cu->editfont)); DerivedMesh *ndm, *orcodm = NULL; - const ModifierApplyFlag app_flag = renderResolution ? MOD_APPLY_RENDER : 0; + ModifierApplyFlag app_flag = MOD_APPLY_ORCO; - if (renderResolution) + if (renderResolution) { + app_flag |= MOD_APPLY_RENDER; required_mode = eModifierMode_Render; + } else required_mode = eModifierMode_Realtime; diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index bc65b27be0c..1c067892702 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -597,13 +597,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *dm) -{ - return applyModifier(md, ob, dm, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_Array = { /* name */ "Array", @@ -622,7 +615,7 @@ ModifierTypeInfo modifierType_Array = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 2d7a7b36a8f..9b0d6c136fd 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -215,13 +215,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), #endif -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_Bevel = { /* name */ "Bevel", @@ -238,7 +231,7 @@ ModifierTypeInfo modifierType_Bevel = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index 28c21c2a879..60fb606ad8b 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -110,7 +110,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DynamicPaintModifierData *pmd = (DynamicPaintModifierData *) md; /* dont apply dynamic paint on orco dm stack */ - if (flag & MOD_APPLY_USECACHE) { + if (!(flag & MOD_APPLY_ORCO)) { return dynamicPaint_Modifier_do(pmd, md->scene, ob, dm); } return dm; diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c index 33601c197b9..94e7475e9b3 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.c +++ b/source/blender/modifiers/intern/MOD_edgesplit.c @@ -141,13 +141,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_EdgeSplit = { /* name */ "EdgeSplit", @@ -166,7 +159,7 @@ ModifierTypeInfo modifierType_EdgeSplit = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 2b29f2afb9a..3c886bafc79 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -335,13 +335,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_Mirror = { /* name */ "Mirror", @@ -360,7 +353,7 @@ ModifierTypeInfo modifierType_Mirror = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 338771f7746..34c89fc6ee3 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -548,14 +548,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - - ModifierTypeInfo modifierType_Ocean = { /* name */ "Ocean", @@ -572,7 +564,7 @@ ModifierTypeInfo modifierType_Ocean = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ freeData, diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 8a6a83b65b2..2c942b38286 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -395,13 +395,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_ParticleInstance = { /* name */ "ParticleInstance", /* structName */ "ParticleInstanceModifierData", @@ -418,7 +411,7 @@ ModifierTypeInfo modifierType_ParticleInstance = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 956823de784..4ec132ce24d 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -931,16 +931,6 @@ static void foreachObjectLink( walk(userData, ob, <md->ob_axis); } -/* This dosnt work with material*/ -static DerivedMesh *applyModifierEM( - ModifierData *md, - Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - static int dependsOnTime(ModifierData *UNUSED(md)) { return 0; @@ -964,7 +954,7 @@ ModifierTypeInfo modifierType_Screw = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ NULL, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index fbd2d3f1200..ad58aac1746 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -1852,18 +1852,6 @@ static void copyData(ModifierData *md, ModifierData *target) *tsmd = *smd; } -static DerivedMesh *applyModifierEM(ModifierData *md, - Object *UNUSED(ob), - struct BMEditMesh *UNUSED(em), - DerivedMesh *dm) -{ - DerivedMesh *result; - - if (!(result = final_skin((SkinModifierData *)md, dm))) - return dm; - return result; -} - static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob), DerivedMesh *dm, @@ -1895,7 +1883,7 @@ ModifierTypeInfo modifierType_Skin = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index d2309e15d10..60891328ff6 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -827,14 +827,6 @@ static DerivedMesh *applyModifier( #undef SOLIDIFY_SIDE_NORMALS -static DerivedMesh *applyModifierEM(ModifierData *md, - Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_Solidify = { /* name */ "Solidify", @@ -854,7 +846,7 @@ ModifierTypeInfo modifierType_Solidify = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c index c48682b877e..4b6f8ce69d4 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.c +++ b/source/blender/modifiers/intern/MOD_subsurf.c @@ -120,7 +120,8 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, static DerivedMesh *applyModifierEM(ModifierData *md, Object *UNUSED(ob), struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) + DerivedMesh *derivedData, + ModifierApplyFlag UNUSED(flag)) { SubsurfModifierData *smd = (SubsurfModifierData *) md; DerivedMesh *result; 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, diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c index 88951919272..962ff161ebc 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.c +++ b/source/blender/modifiers/intern/MOD_uvproject.c @@ -366,13 +366,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return result; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_UVProject = { /* name */ "UVProject", @@ -390,7 +383,7 @@ ModifierTypeInfo modifierType_UVProject = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c index 249c3c89d5f..7498d4dfce9 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.c +++ b/source/blender/modifiers/intern/MOD_uvwarp.c @@ -201,13 +201,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, return dm; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk, void *userData) { UVWarpModifierData *umd = (UVWarpModifierData *) md; @@ -254,7 +247,7 @@ ModifierTypeInfo modifierType_UVWarp = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c index dd84dce05c2..12917af0eb7 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.c +++ b/source/blender/modifiers/intern/MOD_weightvgedit.c @@ -276,13 +276,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der return dm; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_WeightVGEdit = { /* name */ "VertexWeightEdit", @@ -300,7 +293,7 @@ ModifierTypeInfo modifierType_WeightVGEdit = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ freeData, diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index f025352795b..8273b6b09f6 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -398,13 +398,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der return dm; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_WeightVGMix = { /* name */ "VertexWeightMix", @@ -422,7 +415,7 @@ ModifierTypeInfo modifierType_WeightVGMix = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 9a6b46f81b8..9ad96174a03 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -542,13 +542,6 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *der return dm; } -static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob, - struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData) -{ - return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE); -} - ModifierTypeInfo modifierType_WeightVGProximity = { /* name */ "VertexWeightProximity", @@ -566,7 +559,7 @@ ModifierTypeInfo modifierType_WeightVGProximity = { /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, /* applyModifier */ applyModifier, - /* applyModifierEM */ applyModifierEM, + /* applyModifierEM */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, -- cgit v1.2.3