style cleanup: modifier structs
authorCampbell Barton <ideasman42@gmail.com>
Wed, 24 Oct 2012 05:45:54 +0000 (05:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 24 Oct 2012 05:45:54 +0000 (05:45 +0000)
13 files changed:
source/blender/modifiers/intern/MOD_bevel.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_build.c
source/blender/modifiers/intern/MOD_dynamicpaint.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_particleinstance.c
source/blender/modifiers/intern/MOD_remesh.c
source/blender/modifiers/intern/MOD_shapekey.c
source/blender/modifiers/intern/MOD_shrinkwrap.c
source/blender/modifiers/intern/MOD_simpledeform.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/modifiers/intern/MOD_warp.c

index 339f754c3bc2cee4ef9ac65ff8087377c4afa1f2..c3cae63971bdc66303f205f7e454f178be3b64e4 100644 (file)
@@ -206,29 +206,29 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
 
 
 ModifierTypeInfo modifierType_Bevel = {
-       /* name */ "Bevel",
-       /* structName */ "BevelModifierData",
-       /* structSize */ sizeof(BevelModifierData),
-       /* type */ eModifierTypeType_Constructive,
-       /* flags */ eModifierTypeFlag_AcceptsMesh |
-       eModifierTypeFlag_SupportsEditmode |
-       eModifierTypeFlag_EnableInEditmode,
-
-       /* copyData */ copyData,
-       /* deformVerts */ NULL,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ NULL,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ applyModifier,
-       /* applyModifierEM */ applyModifierEM,
-       /* initData */ initData,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ NULL,
-       /* isDisabled */ NULL,
-       /* updateDepgraph */ NULL,
-       /* dependsOnTime */ NULL,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Bevel",
+       /* structName */        "BevelModifierData",
+       /* structSize */        sizeof(BevelModifierData),
+       /* type */              eModifierTypeType_Constructive,
+       /* flags */             eModifierTypeFlag_AcceptsMesh |
+                               eModifierTypeFlag_SupportsEditmode |
+                               eModifierTypeFlag_EnableInEditmode,
+
+       /* copyData */          copyData,
+       /* deformVerts */       NULL,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     applyModifier,
+       /* applyModifierEM */   applyModifierEM,
+       /* initData */          initData,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          NULL,
+       /* isDisabled */        NULL,
+       /* updateDepgraph */    NULL,
+       /* dependsOnTime */     NULL,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ NULL,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 5c78a8efe230a312eed3c5c040de20408bdf35b6..39bbe034bb81f8fb37f419f6222fc63a26383f97 100644 (file)
@@ -192,28 +192,28 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *UNUSED(
 
 
 ModifierTypeInfo modifierType_Boolean = {
-       /* name */ "Boolean",
-       /* structName */ "BooleanModifierData",
-       /* structSize */ sizeof(BooleanModifierData),
-       /* type */ eModifierTypeType_Nonconstructive,
-       /* flags */ eModifierTypeFlag_AcceptsMesh |
-       eModifierTypeFlag_UsesPointCache,
-
-       /* copyData */ copyData,
-       /* deformVerts */ NULL,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ NULL,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ applyModifier,
-       /* applyModifierEM */ NULL,
-       /* initData */ NULL,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ NULL,
-       /* isDisabled */ isDisabled,
-       /* updateDepgraph */ updateDepgraph,
-       /* dependsOnTime */ NULL,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Boolean",
+       /* structName */        "BooleanModifierData",
+       /* structSize */        sizeof(BooleanModifierData),
+       /* type */              eModifierTypeType_Nonconstructive,
+       /* flags */             eModifierTypeFlag_AcceptsMesh |
+                               eModifierTypeFlag_UsesPointCache,
+
+       /* copyData */          copyData,
+       /* deformVerts */       NULL,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     applyModifier,
+       /* applyModifierEM */   NULL,
+       /* initData */          NULL,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          NULL,
+       /* isDisabled */        isDisabled,
+       /* updateDepgraph */    updateDepgraph,
+       /* dependsOnTime */     NULL,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ foreachObjectLink,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 121b0ee89e3d61dba545a4eaca2b48a6ec8a6a39..2105a6efd21cbcde25d4d874eb2a7f3f7fa64e1e 100644 (file)
@@ -293,27 +293,27 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
 
 
 ModifierTypeInfo modifierType_Build = {
-       /* name */ "Build",
-       /* structName */ "BuildModifierData",
-       /* structSize */ sizeof(BuildModifierData),
-       /* type */ eModifierTypeType_Nonconstructive,
-       /* flags */ eModifierTypeFlag_AcceptsMesh |
-       eModifierTypeFlag_AcceptsCVs,
-       /* copyData */ copyData,
-       /* deformVerts */ NULL,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ NULL,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ applyModifier,
-       /* applyModifierEM */ NULL,
-       /* initData */ initData,
-       /* requiredDataMask */ NULL,
-       /* freeData */ NULL,
-       /* isDisabled */ NULL,
-       /* updateDepgraph */ NULL,
-       /* dependsOnTime */ dependsOnTime,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Build",
+       /* structName */        "BuildModifierData",
+       /* structSize */        sizeof(BuildModifierData),
+       /* type */              eModifierTypeType_Nonconstructive,
+       /* flags */             eModifierTypeFlag_AcceptsMesh |
+                               eModifierTypeFlag_AcceptsCVs,
+       /* copyData */          copyData,
+       /* deformVerts */       NULL,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     applyModifier,
+       /* applyModifierEM */   NULL,
+       /* initData */          initData,
+       /* requiredDataMask */  NULL,
+       /* freeData */          NULL,
+       /* isDisabled */        NULL,
+       /* updateDepgraph */    NULL,
+       /* dependsOnTime */     dependsOnTime,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ NULL,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 7d7bfade9b73dffa480c506c232ee9eb726a1b87..80866a7c435d7bb5af5199643faeb108e4b01954 100644 (file)
@@ -170,10 +170,10 @@ ModifierTypeInfo modifierType_DynamicPaint = {
        /* structSize */        sizeof(DynamicPaintModifierData),
        /* type */              eModifierTypeType_Constructive,
        /* flags */             eModifierTypeFlag_AcceptsMesh |
-/*                            eModifierTypeFlag_SupportsMapping |*/
-                              eModifierTypeFlag_UsesPointCache |
-                              eModifierTypeFlag_Single |
-                              eModifierTypeFlag_UsesPreview,
+/*                             eModifierTypeFlag_SupportsMapping |*/
+                               eModifierTypeFlag_UsesPointCache |
+                               eModifierTypeFlag_Single |
+                               eModifierTypeFlag_UsesPreview,
 
        /* copyData */          copyData,
        /* deformVerts */       NULL,
index 254578f73993636547f5d3bc9e05be3d1b6bbe99..bcbc21d5b6c8bfb21027085c34790a90d39141ee 100644 (file)
@@ -1039,26 +1039,26 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob,
 
 
 ModifierTypeInfo modifierType_Explode = {
-       /* name */ "Explode",
-       /* structName */ "ExplodeModifierData",
-       /* structSize */ sizeof(ExplodeModifierData),
-       /* type */ eModifierTypeType_Constructive,
-       /* flags */ eModifierTypeFlag_AcceptsMesh,
-       /* copyData */ copyData,
-       /* deformVerts */ NULL,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ NULL,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ applyModifier,
-       /* applyModifierEM */ NULL,
-       /* initData */ initData,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ freeData,
-       /* isDisabled */ NULL,
-       /* updateDepgraph */ NULL,
-       /* dependsOnTime */ dependsOnTime,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Explode",
+       /* structName */        "ExplodeModifierData",
+       /* structSize */        sizeof(ExplodeModifierData),
+       /* type */              eModifierTypeType_Constructive,
+       /* flags */             eModifierTypeFlag_AcceptsMesh,
+       /* copyData */          copyData,
+       /* deformVerts */       NULL,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     applyModifier,
+       /* applyModifierEM */   NULL,
+       /* initData */          initData,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          freeData,
+       /* isDisabled */        NULL,
+       /* updateDepgraph */    NULL,
+       /* dependsOnTime */     dependsOnTime,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ NULL,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index f0bdf1bb73712d94a682da167cfc54ca2477f09b..e584244e6a75b5f68bece22adcd518f7c0659ed9 100644 (file)
@@ -431,28 +431,28 @@ void modifier_mdef_compact_influences(ModifierData *md)
 }
 
 ModifierTypeInfo modifierType_MeshDeform = {
-       /* name */ "MeshDeform",
-       /* structName */ "MeshDeformModifierData",
-       /* structSize */ sizeof(MeshDeformModifierData),
-       /* type */ eModifierTypeType_OnlyDeform,
-       /* flags */ eModifierTypeFlag_AcceptsCVs |
-       eModifierTypeFlag_SupportsEditmode,
-
-       /* copyData */ copyData,
-       /* deformVerts */ deformVerts,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ deformVertsEM,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ NULL,
-       /* applyModifierEM */ NULL,
-       /* initData */ initData,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ freeData,
-       /* isDisabled */ isDisabled,
-       /* updateDepgraph */ updateDepgraph,
-       /* dependsOnTime */ NULL,
-       /* dependsOnNormals */ NULL,
+       /* name */              "MeshDeform",
+       /* structName */        "MeshDeformModifierData",
+       /* structSize */        sizeof(MeshDeformModifierData),
+       /* type */              eModifierTypeType_OnlyDeform,
+       /* flags */             eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_SupportsEditmode,
+
+       /* copyData */          copyData,
+       /* deformVerts */       deformVerts,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     deformVertsEM,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     NULL,
+       /* applyModifierEM */   NULL,
+       /* initData */          initData,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          freeData,
+       /* isDisabled */        isDisabled,
+       /* updateDepgraph */    updateDepgraph,
+       /* dependsOnTime */     NULL,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ foreachObjectLink,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 20b02c63605a3e32b632d7abf9e130b3d2e1f45b..4984682455a824ebbfa05f330b6c06cd3142baf8 100644 (file)
@@ -401,32 +401,31 @@ static DerivedMesh *applyModifierEM(ModifierData *md, Object *ob,
        return applyModifier(md, ob, derivedData, MOD_APPLY_USECACHE);
 }
 
-
 ModifierTypeInfo modifierType_ParticleInstance = {
-       /* name */ "ParticleInstance",
-       /* structName */ "ParticleInstanceModifierData",
-       /* structSize */ sizeof(ParticleInstanceModifierData),
-       /* type */ eModifierTypeType_Constructive,
-       /* flags */ eModifierTypeFlag_AcceptsMesh |
-       eModifierTypeFlag_SupportsMapping |
-       eModifierTypeFlag_SupportsEditmode |
-       eModifierTypeFlag_EnableInEditmode,
-
-       /* copyData */ copyData,
-       /* deformVerts */ NULL,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ NULL,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ applyModifier,
-       /* applyModifierEM */ applyModifierEM,
-       /* initData */ initData,
-       /* requiredDataMask */ NULL,
-       /* freeData */ NULL,
-       /* isDisabled */ isDisabled,
-       /* updateDepgraph */ updateDepgraph,
-       /* dependsOnTime */ dependsOnTime,
-       /* dependsOnNormals */ NULL,
+       /* name */              "ParticleInstance",
+       /* structName */        "ParticleInstanceModifierData",
+       /* structSize */        sizeof(ParticleInstanceModifierData),
+       /* type */              eModifierTypeType_Constructive,
+       /* flags */             eModifierTypeFlag_AcceptsMesh |
+                               eModifierTypeFlag_SupportsMapping |
+                               eModifierTypeFlag_SupportsEditmode |
+                               eModifierTypeFlag_EnableInEditmode,
+
+       /* copyData */          copyData,
+       /* deformVerts */       NULL,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     NULL,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     applyModifier,
+       /* applyModifierEM */   applyModifierEM,
+       /* initData */          initData,
+       /* requiredDataMask */  NULL,
+       /* freeData */          NULL,
+       /* isDisabled */        isDisabled,
+       /* updateDepgraph */    updateDepgraph,
+       /* dependsOnTime */     dependsOnTime,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ foreachObjectLink,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 2b55471be3db51a9363ef3ee69032d343872d3dd..746cad10a01fbc7736998970bb5085477cb7b65e 100644 (file)
@@ -223,7 +223,7 @@ ModifierTypeInfo modifierType_Remesh = {
        /* structSize */        sizeof(RemeshModifierData),
        /* type */              eModifierTypeType_Nonconstructive,
        /* flags */             eModifierTypeFlag_AcceptsMesh |
-                                                       eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_AcceptsCVs |
                                eModifierTypeFlag_SupportsEditmode,
        /* copyData */          copyData,
        /* deformVerts */       NULL,
index 8ef86362edd42cbd6dc152776cef620ee9b8b5f3..7fe8dc697909ef58aa388be0c8d703c5323d1bd1 100644 (file)
@@ -122,6 +122,7 @@ static void deformMatricesEM(ModifierData *UNUSED(md), Object *ob,
        }
 }
 
+
 ModifierTypeInfo modifierType_ShapeKey = {
        /* name */              "ShapeKey",
        /* structName */        "ShapeKeyModifierData",
index 45cd33efea885a6addf16595213929d3a4ffb442..d3a03614d7c990178edda753942eec57deb9acb2 100644 (file)
@@ -163,30 +163,30 @@ static void updateDepgraph(ModifierData *md, DagForest *forest,
 
 
 ModifierTypeInfo modifierType_Shrinkwrap = {
-       /* name */ "Shrinkwrap",
-       /* structName */ "ShrinkwrapModifierData",
-       /* structSize */ sizeof(ShrinkwrapModifierData),
-       /* type */ eModifierTypeType_OnlyDeform,
-       /* flags */ eModifierTypeFlag_AcceptsMesh |
-       eModifierTypeFlag_AcceptsCVs |
-       eModifierTypeFlag_SupportsEditmode |
-       eModifierTypeFlag_EnableInEditmode,
-
-       /* copyData */ copyData,
-       /* deformVerts */ deformVerts,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ deformVertsEM,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ NULL,
-       /* applyModifierEM */ NULL,
-       /* initData */ initData,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ NULL,
-       /* isDisabled */ isDisabled,
-       /* updateDepgraph */ updateDepgraph,
-       /* dependsOnTime */ NULL,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Shrinkwrap",
+       /* structName */        "ShrinkwrapModifierData",
+       /* structSize */        sizeof(ShrinkwrapModifierData),
+       /* type */              eModifierTypeType_OnlyDeform,
+       /* flags */             eModifierTypeFlag_AcceptsMesh |
+                               eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_SupportsEditmode |
+                               eModifierTypeFlag_EnableInEditmode,
+
+       /* copyData */          copyData,
+       /* deformVerts */       deformVerts,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     deformVertsEM,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     NULL,
+       /* applyModifierEM */   NULL,
+       /* initData */          initData,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          NULL,
+       /* isDisabled */        isDisabled,
+       /* updateDepgraph */    updateDepgraph,
+       /* dependsOnTime */     NULL,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ foreachObjectLink,
-       /* foreachIDLink */ NULL,
-       /* foreachTexLink */ NULL,
+       /* foreachIDLink */     NULL,
+       /* foreachTexLink */    NULL,
 };
index 9f815f104cbac020c1a5ca3276329c1f5a2b8bac..5267c0d9ccb3a557d20d6fbc3b1fd82716a2f17e 100644 (file)
@@ -353,9 +353,9 @@ ModifierTypeInfo modifierType_SimpleDeform = {
        /* type */              eModifierTypeType_OnlyDeform,
 
        /* flags */             eModifierTypeFlag_AcceptsMesh |
-                                                       eModifierTypeFlag_AcceptsCVs |
-                                                       eModifierTypeFlag_SupportsEditmode |
-                                                       eModifierTypeFlag_EnableInEditmode,
+                               eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_SupportsEditmode |
+                               eModifierTypeFlag_EnableInEditmode,
 
        /* copyData */          copyData,
        /* deformVerts */       deformVerts,
index 545e2135344f98e73c95e29ecf1655464f6bda3a..1d35d8f55bf54242b53383f0d66696c54aae1c0a 100644 (file)
@@ -250,7 +250,7 @@ ModifierTypeInfo modifierType_Smooth = {
        /* structSize */        sizeof(SmoothModifierData),
        /* type */              eModifierTypeType_OnlyDeform,
        /* flags */             eModifierTypeFlag_AcceptsMesh |
-                                                       eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_AcceptsCVs |
                                eModifierTypeFlag_SupportsEditmode,
 
        /* copyData */          copyData,
index fab73fd9585dbf9547427ed1d59bd4825ddf31e5..e8cd4f25789a5e05606b9d0933cdfbe42ad62398 100644 (file)
@@ -357,27 +357,27 @@ static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editD
 
 
 ModifierTypeInfo modifierType_Warp = {
-       /* name */ "Warp",
-       /* structName */ "WarpModifierData",
-       /* structSize */ sizeof(WarpModifierData),
-       /* type */ eModifierTypeType_OnlyDeform,
-       /* flags */ eModifierTypeFlag_AcceptsCVs |
-       eModifierTypeFlag_SupportsEditmode,
-       /* copyData */ copyData,
-       /* deformVerts */ deformVerts,
-       /* deformMatrices */ NULL,
-       /* deformVertsEM */ deformVertsEM,
-       /* deformMatricesEM */ NULL,
-       /* applyModifier */ 0,
-       /* applyModifierEM */ 0,
-       /* initData */ initData,
-       /* requiredDataMask */ requiredDataMask,
-       /* freeData */ freeData,
-       /* isDisabled */ isDisabled,
-       /* updateDepgraph */ updateDepgraph,
-       /* dependsOnTime */ dependsOnTime,
-       /* dependsOnNormals */ NULL,
+       /* name */              "Warp",
+       /* structName */        "WarpModifierData",
+       /* structSize */        sizeof(WarpModifierData),
+       /* type */              eModifierTypeType_OnlyDeform,
+       /* flags */             eModifierTypeFlag_AcceptsCVs |
+                               eModifierTypeFlag_SupportsEditmode,
+       /* copyData */          copyData,
+       /* deformVerts */       deformVerts,
+       /* deformMatrices */    NULL,
+       /* deformVertsEM */     deformVertsEM,
+       /* deformMatricesEM */  NULL,
+       /* applyModifier */     0,
+       /* applyModifierEM */   0,
+       /* initData */          initData,
+       /* requiredDataMask */  requiredDataMask,
+       /* freeData */          freeData,
+       /* isDisabled */        isDisabled,
+       /* updateDepgraph */    updateDepgraph,
+       /* dependsOnTime */     dependsOnTime,
+       /* dependsOnNormals */  NULL,
        /* foreachObjectLink */ foreachObjectLink,
-       /* foreachIDLink */ foreachIDLink,
-       /* foreachTexLink */ foreachTexLink,
+       /* foreachIDLink */     foreachIDLink,
+       /* foreachTexLink */    foreachTexLink,
 };