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_collision.c | |
| parent | 900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff) | |
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_collision.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index e0b9939d152..eb4511ddaec 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -55,7 +55,7 @@ static void initData(ModifierData *md) { - CollisionModifierData *collmd = (CollisionModifierData*) md; + CollisionModifierData *collmd = (CollisionModifierData *) md; collmd->x = NULL; collmd->xnew = NULL; @@ -69,7 +69,7 @@ static void initData(ModifierData *md) static void freeData(ModifierData *md) { - CollisionModifierData *collmd = (CollisionModifierData*) md; + CollisionModifierData *collmd = (CollisionModifierData *) md; if (collmd) { if (collmd->bvhtree) @@ -105,13 +105,13 @@ static int dependsOnTime(ModifierData *UNUSED(md)) } static void deformVerts(ModifierData *md, Object *ob, - DerivedMesh *derivedData, - float (*vertexCos)[3], - int UNUSED(numVerts), - int UNUSED(useRenderParams), - int UNUSED(isFinalCalc)) + DerivedMesh *derivedData, + float (*vertexCos)[3], + int UNUSED(numVerts), + int UNUSED(useRenderParams), + int UNUSED(isFinalCalc)) { - CollisionModifierData *collmd = (CollisionModifierData*) md; + CollisionModifierData *collmd = (CollisionModifierData *) md; DerivedMesh *dm = NULL; MVert *tempVert = NULL; @@ -136,7 +136,7 @@ static void deformVerts(ModifierData *md, Object *ob, if (G.rt > 0) printf("current_time %f, collmd->time_xnew %f\n", current_time, collmd->time_xnew); - numverts = dm->getNumVerts (dm); + numverts = dm->getNumVerts(dm); if ((current_time > collmd->time_xnew) || (BKE_ptcache_get_continue_physics())) { unsigned int i; @@ -177,15 +177,15 @@ static void deformVerts(ModifierData *md, Object *ob, collmd->xnew = tempVert; collmd->time_x = collmd->time_xnew; - memcpy(collmd->xnew, dm->getVertArray(dm), numverts*sizeof(MVert)); + memcpy(collmd->xnew, dm->getVertArray(dm), numverts * sizeof(MVert)); for (i = 0; i < numverts; i++) { // we save global positions mul_m4_v3(ob->obmat, collmd->xnew[i].co); } - memcpy(collmd->current_xnew, collmd->x, numverts*sizeof(MVert)); - memcpy(collmd->current_x, collmd->x, numverts*sizeof(MVert)); + memcpy(collmd->current_xnew, collmd->x, numverts * sizeof(MVert)); + memcpy(collmd->current_x, collmd->x, numverts * sizeof(MVert)); /* check if GUI setting has changed for bvh */ if (collmd->bvhtree) { @@ -202,7 +202,7 @@ static void deformVerts(ModifierData *md, Object *ob, } else { // recalc static bounding boxes - bvhtree_update_from_mvert ( collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1 ); + bvhtree_update_from_mvert(collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1); } collmd->time_xnew = current_time; @@ -232,8 +232,8 @@ ModifierTypeInfo modifierType_Collision = { /* structName */ "CollisionModifierData", /* structSize */ sizeof(CollisionModifierData), /* type */ eModifierTypeType_OnlyDeform, - /* flags */ eModifierTypeFlag_AcceptsMesh - | eModifierTypeFlag_Single, + /* flags */ eModifierTypeFlag_AcceptsMesh | + eModifierTypeFlag_Single, /* copyData */ NULL, /* deformVerts */ deformVerts, |