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_remesh.c | |
parent | 900c8a91548ab867391aa8d130cd03ff2d0e3d21 (diff) |
style cleanup: modifiers
Diffstat (limited to 'source/blender/modifiers/intern/MOD_remesh.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 56b6493eda6..741014ebc7f 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -50,7 +50,7 @@ static void initData(ModifierData *md) { - RemeshModifierData *rmd = (RemeshModifierData*) md; + RemeshModifierData *rmd = (RemeshModifierData *) md; rmd->scale = 0.9; rmd->depth = 4; @@ -62,8 +62,8 @@ static void initData(ModifierData *md) static void copyData(ModifierData *md, ModifierData *target) { - RemeshModifierData *rmd = (RemeshModifierData*) md; - RemeshModifierData *trmd = (RemeshModifierData*) target; + RemeshModifierData *rmd = (RemeshModifierData *) md; + RemeshModifierData *trmd = (RemeshModifierData *) target; trmd->threshold = rmd->threshold; trmd->scale = rmd->scale; @@ -79,11 +79,11 @@ static void init_dualcon_mesh(DualConInput *mesh, DerivedMesh *dm) { memset(mesh, 0, sizeof(DualConInput)); - mesh->co = (void*)dm->getVertArray(dm); + mesh->co = (void *)dm->getVertArray(dm); mesh->co_stride = sizeof(MVert); mesh->totco = dm->getNumVerts(dm); - mesh->faces = (void*)dm->getTessFaceArray(dm); + mesh->faces = (void *)dm->getTessFaceArray(dm); mesh->face_stride = sizeof(MFace); mesh->totface = dm->getNumTessFaces(dm); @@ -108,7 +108,7 @@ static void *dualcon_alloc_output(int totvert, int totquad) return NULL; } - output->dm = CDDM_new(totvert, 0, 0, 4*totquad, totquad); + output->dm = CDDM_new(totvert, 0, 0, 4 * totquad, totquad); return output; } @@ -145,10 +145,10 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4]) } static DerivedMesh *applyModifier(ModifierData *md, - Object *UNUSED(ob), - DerivedMesh *dm, - int UNUSED(useRenderParams), - int UNUSED(isFinalCalc)) + Object *UNUSED(ob), + DerivedMesh *dm, + int UNUSED(useRenderParams), + int UNUSED(isFinalCalc)) { RemeshModifierData *rmd; DualConOutput *output; @@ -159,7 +159,7 @@ static DerivedMesh *applyModifier(ModifierData *md, DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */ - rmd = (RemeshModifierData*)md; + rmd = (RemeshModifierData *)md; init_dualcon_mesh(&input, dm); @@ -167,27 +167,27 @@ static DerivedMesh *applyModifier(ModifierData *md, flags |= DUALCON_FLOOD_FILL; switch (rmd->mode) { - case MOD_REMESH_CENTROID: - mode = DUALCON_CENTROID; - break; - case MOD_REMESH_MASS_POINT: - mode = DUALCON_MASS_POINT; - break; - case MOD_REMESH_SHARP_FEATURES: - mode = DUALCON_SHARP_FEATURES; - break; + case MOD_REMESH_CENTROID: + mode = DUALCON_CENTROID; + break; + case MOD_REMESH_MASS_POINT: + mode = DUALCON_MASS_POINT; + break; + case MOD_REMESH_SHARP_FEATURES: + mode = DUALCON_SHARP_FEATURES; + break; } output = dualcon(&input, - dualcon_alloc_output, - dualcon_add_vert, - dualcon_add_quad, - flags, - mode, - rmd->threshold, - rmd->hermite_num, - rmd->scale, - rmd->depth); + dualcon_alloc_output, + dualcon_add_vert, + dualcon_add_quad, + flags, + mode, + rmd->threshold, + rmd->hermite_num, + rmd->scale, + rmd->depth); result = output->dm; MEM_freeN(output); @@ -199,9 +199,9 @@ static DerivedMesh *applyModifier(ModifierData *md, #else /* !WITH_MOD_REMESH */ static DerivedMesh *applyModifier(ModifierData *UNUSED(md), Object *UNUSED(ob), - DerivedMesh *derivedData, - int UNUSED(useRenderParams), - int UNUSED(isFinalCalc)) + DerivedMesh *derivedData, + int UNUSED(useRenderParams), + int UNUSED(isFinalCalc)) { return derivedData; } @@ -213,7 +213,8 @@ ModifierTypeInfo modifierType_Remesh = { /* structName */ "RemeshModifierData", /* structSize */ sizeof(RemeshModifierData), /* type */ eModifierTypeType_Nonconstructive, - /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode, + /* flags */ eModifierTypeFlag_AcceptsMesh | + eModifierTypeFlag_SupportsEditmode, /* copyData */ copyData, /* deformVerts */ NULL, /* deformMatrices */ NULL, |