diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_correctivesmooth.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_correctivesmooth.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index 79702517991..cc6177b9bc8 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -1,6 +1,4 @@ /* - * ***** BEGIN GPL LICENSE BLOCK ***** - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 @@ -17,28 +15,23 @@ * * The Original Code is Copyright (C) 2005 by the Blender Foundation. * All rights reserved. - * - * Contributor(s): Jack Simpson, - * Campbell Barton - * - * ***** END GPL LICENSE BLOCK ***** - * */ -/** \file blender/modifiers/intern/MOD_correctivesmooth.c - * \ingroup modifiers +/** \file + * \ingroup modifiers * * Method of smoothing deformation, also known as 'delta-mush'. */ +#include "BLI_utildefines.h" + +#include "BLI_math.h" + #include "DNA_scene_types.h" #include "DNA_meshdata_types.h" #include "DNA_object_types.h" #include "DNA_mesh_types.h" -#include "BLI_math.h" -#include "BLI_utildefines.h" - #include "MEM_guardedalloc.h" #include "BKE_deform.h" @@ -112,15 +105,14 @@ static void freeData(ModifierData *md) } -static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) +static void requiredDataMask(Object *UNUSED(ob), ModifierData *md, CustomData_MeshMasks *r_cddata_masks) { CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md; - CustomDataMask dataMask = 0; + /* ask for vertex groups if we need them */ - if (csmd->defgrp_name[0]) { - dataMask |= CD_MASK_MDEFORMVERT; + if (csmd->defgrp_name[0] != '\0') { + r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT; } - return dataMask; } |