diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-06 17:38:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-06 17:38:33 +0400 |
commit | 3d8e58751c3801a6ad2e00ed7c35059e827059b2 (patch) | |
tree | 9eb8ec613a1dad477b9607a6371b723d0be25650 /source/blender/modifiers/intern/MOD_hook.c | |
parent | 900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff) |
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_hook.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_hook.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/modifiers/intern/MOD_hook.c b/source/blender/modifiers/intern/MOD_hook.c index 0b0a276c4a0..9acf556fc37 100644 --- a/source/blender/modifiers/intern/MOD_hook.c +++ b/source/blender/modifiers/intern/MOD_hook.c @@ -54,15 +54,15 @@ static void initData(ModifierData *md) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; - hmd->force= 1.0; + hmd->force = 1.0; } static void copyData(ModifierData *md, ModifierData *target) { - HookModifierData *hmd = (HookModifierData*) md; - HookModifierData *thmd = (HookModifierData*) target; + HookModifierData *hmd = (HookModifierData *) md; + HookModifierData *thmd = (HookModifierData *) target; copy_v3_v3(thmd->cent, hmd->cent); thmd->falloff = hmd->falloff; @@ -89,34 +89,34 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) static void freeData(ModifierData *md) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; if (hmd->indexar) MEM_freeN(hmd->indexar); } static int isDisabled(ModifierData *md, int UNUSED(useRenderParams)) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; return !hmd->object; } static void foreachObjectLink( - ModifierData *md, Object *ob, - void (*walk)(void *userData, Object *ob, Object **obpoin), - void *userData) + ModifierData *md, Object *ob, + void (*walk)(void *userData, Object *ob, Object **obpoin), + void *userData) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; walk(userData, ob, &hmd->object); } static void updateDepgraph(ModifierData *md, DagForest *forest, - struct Scene *UNUSED(scene), - Object *UNUSED(ob), - DagNode *obNode) + struct Scene *UNUSED(scene), + Object *UNUSED(ob), + DagNode *obNode) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; if (hmd->object) { DagNode *curNode = dag_get_node(forest, hmd->object); @@ -146,10 +146,10 @@ static float hook_falloff(const float co_1[3], const float co_2[3], const float static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, float (*vertexCos)[3], int numVerts) { - bPoseChannel *pchan= BKE_pose_channel_find_name(hmd->object->pose, hmd->subtarget); + bPoseChannel *pchan = BKE_pose_channel_find_name(hmd->object->pose, hmd->subtarget); float vec[3], mat[4][4], dmat[4][4]; int i, *index_pt; - const float falloff_squared= hmd->falloff * hmd->falloff; /* for faster comparisons */ + const float falloff_squared = hmd->falloff * hmd->falloff; /* for faster comparisons */ MDeformVert *dvert; int defgrp_index, max_dvert; @@ -168,7 +168,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, NULL, NULL, NULL, NULL, NULL); modifier_get_vgroup(ob, dm, hmd->name, &dvert, &defgrp_index); - max_dvert = (dvert)? numVerts: 0; + max_dvert = (dvert) ? numVerts : 0; /* Regarding index range checking below. * @@ -182,13 +182,13 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, /* do nothing, avoid annoying checks in the loop */ } else if (hmd->indexar) { /* vertex indices? */ - const float fac_orig= hmd->force; + const float fac_orig = hmd->force; float fac; const int *origindex_ar; /* if DerivedMesh is present and has original index data, use it */ - if (dm && (origindex_ar= dm->getVertDataArray(dm, CD_ORIGINDEX))) { - for (i= 0, index_pt= hmd->indexar; i < hmd->totindex; i++, index_pt++) { + if (dm && (origindex_ar = dm->getVertDataArray(dm, CD_ORIGINDEX))) { + for (i = 0, index_pt = hmd->indexar; i < hmd->totindex; i++, index_pt++) { if (*index_pt < numVerts) { int j; @@ -226,7 +226,7 @@ static void deformVerts_do(HookModifierData *hmd, Object *ob, DerivedMesh *dm, } } } - else if (dvert) { /* vertex group hook */ + else if (dvert) { /* vertex group hook */ const float fac_orig = hmd->force; for (i = 0; i < max_dvert; i++, dvert++) { @@ -248,7 +248,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts, int UNUSED(useRenderParams), int UNUSED(isFinalCalc)) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; DerivedMesh *dm = derivedData; /* We need a valid dm for meshes when a vgroup is set... */ if (!dm && ob->type == OB_MESH && hmd->name[0] != '\0') @@ -263,7 +263,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, static void deformVertsEM(ModifierData *md, Object *ob, struct BMEditMesh *editData, DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) { - HookModifierData *hmd = (HookModifierData*) md; + HookModifierData *hmd = (HookModifierData *) md; DerivedMesh *dm = derivedData; /* We need a valid dm for meshes when a vgroup is set... */ if (!dm && ob->type == OB_MESH && hmd->name[0] != '\0') @@ -281,8 +281,8 @@ ModifierTypeInfo modifierType_Hook = { /* structName */ "HookModifierData", /* structSize */ sizeof(HookModifierData), /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsCVs - | eModifierTypeFlag_SupportsEditmode, + /* flags */ eModifierTypeFlag_AcceptsCVs | + eModifierTypeFlag_SupportsEditmode, /* copyData */ copyData, /* deformVerts */ deformVerts, /* deformMatrices */ NULL, |