merge with/from trunk at r35190
[blender.git] / source / blender / modifiers / intern / MOD_bevel.c
index e37bf18a29381c2d61a178a3913460bd2130abba..8d34fdcb10e3c9791ffbe2140911fe4d185358ac 100644 (file)
 * ***** END GPL LICENSE BLOCK *****
 *
 */
+
+/** \file blender/modifiers/intern/MOD_bevel.c
+ *  \ingroup modifiers
+ */
+
 #include "MEM_guardedalloc.h"
 
+#include "BLI_utildefines.h"
+
 #include "BKE_bmesh.h"
 #include "BKE_cdderivedmesh.h"
 #include "BKE_modifier.h"
 #include "BKE_particle.h"
 
+#include "MOD_util.h"
+
 
 static void initData(ModifierData *md)
 {
@@ -66,20 +75,21 @@ static void copyData(ModifierData *md, ModifierData *target)
        strncpy(tbmd->defgrp_name, bmd->defgrp_name, 32);
 }
 
-static CustomDataMask requiredDataMask(Object *ob, ModifierData *md)
+static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
 {
        BevelModifierData *bmd = (BevelModifierData *)md;
        CustomDataMask dataMask = 0;
 
        /* ask for vertexgroups if we need them */
-       if(bmd->defgrp_name[0]) dataMask |= (1 << CD_MDEFORMVERT);
+       if(bmd->defgrp_name[0]) dataMask |= CD_MASK_MDEFORMVERT;
 
        return dataMask;
 }
 
-static DerivedMesh *applyModifier(
-               ModifierData *md, Object *ob, DerivedMesh *derivedData,
-  int useRenderParams, int isFinalCalc)
+static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
+                                               DerivedMesh *derivedData,
+                                               int UNUSED(useRenderParams),
+                                               int UNUSED(isFinalCalc))
 {
 #if 0
        DerivedMesh *result;
@@ -109,9 +119,9 @@ static DerivedMesh *applyModifier(
        return CDDM_copy(derivedData, 0);
 }
 
-static DerivedMesh *applyModifierEM(
-               ModifierData *md, Object *ob, EditMesh *editData,
-  DerivedMesh *derivedData)
+static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
+                                               EditMesh *UNUSED(editData),
+                                               DerivedMesh *derivedData)
 {
        return applyModifier(md, ob, derivedData, 0, 1);
 }
@@ -128,6 +138,7 @@ ModifierTypeInfo modifierType_Bevel = {
 
        /* copyData */          copyData,
        /* deformVerts */       0,
+       /* deformMatrices */    0,
        /* deformVertsEM */     0,
        /* deformMatricesEM */  0,
        /* applyModifier */     applyModifier,
@@ -138,6 +149,7 @@ ModifierTypeInfo modifierType_Bevel = {
        /* isDisabled */        0,
        /* updateDepgraph */    0,
        /* dependsOnTime */     0,
+       /* dependsOnNormals */  0,
        /* foreachObjectLink */ 0,
        /* foreachIDLink */     0,
 };