diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index b81536ff947..a90ddde7946 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -301,7 +301,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes MEM_freeN(looptris); } - result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0); + result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL); BM_mesh_free(bm); @@ -321,13 +321,11 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes return result; } -static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md)) +static void requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(md), CustomData_MeshMasks *r_cddata_masks) { - CustomDataMask dataMask = CD_MASK_MTFACE | CD_MASK_MEDGE; - - dataMask |= CD_MASK_MDEFORMVERT; - - return dataMask; + r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; + r_cddata_masks->emask |= CD_MASK_MEDGE; + r_cddata_masks->fmask |= CD_MASK_MTFACE; } ModifierTypeInfo modifierType_Boolean = { |