diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-09 12:49:27 +0300 |
| commit | a5b4b0f21c1ae8c96e4fea9abdcfac2fab1cf300 (patch) | |
| tree | 0658d8bdfb8ec03652aa04f82ee8a4d243ec6370 /source/blender/modifiers/intern/MOD_mask.c | |
| parent | d68f698cf0321477c0734474150eb4bc43c4e85f (diff) | |
| parent | abcda06934aba054de8540b66b13c2bbc5f8f515 (diff) | |
Merge branch '28' into custom-manipulatorscustom-manipulators
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mask.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mask.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index 11c0fae9a75..d942b23b216 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -52,6 +52,8 @@ #include "DEG_depsgraph_build.h" +#include "MOD_modifiertypes.h" + #include "BLI_strict_flags.h" static void copyData(ModifierData *md, ModifierData *target) @@ -92,8 +94,8 @@ static void updateDepsgraph(ModifierData *md, } } -static DerivedMesh *applyModifier(ModifierData *md, Object *ob, - DerivedMesh *dm, +static DerivedMesh *applyModifier(ModifierData *md, const struct EvaluationContext *UNUSED(eval_ctx), + Object *ob, DerivedMesh *dm, ModifierApplyFlag UNUSED(flag)) { MaskModifierData *mmd = (MaskModifierData *)md; |