diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 18:42:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-05-02 18:42:05 +0400 |
| commit | 4a4f091155e7fb1c7eba0988c815b41665e045b6 (patch) | |
| tree | 3e3f3ffb6b4935a13efd763f3d6de2e387c725f2 /source/blender/modifiers/intern/MOD_screw.c | |
| parent | 4a8663d66e4d82b7a8b9a3f6155c6367b694e08c (diff) | |
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.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_screw.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 12 |
1 files changed, 1 insertions, 11 deletions
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, |