From 31d2ee9bf77bb991ea4779c47379b2cee84b27ed Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 6 Mar 2012 18:40:15 +0000 Subject: style cleanup, brackets in else/if, some indentation. --- source/blender/modifiers/intern/MOD_boolean_util.c | 8 +++-- source/blender/modifiers/intern/MOD_cloth.c | 22 +++++--------- source/blender/modifiers/intern/MOD_collision.c | 15 ++++------ source/blender/modifiers/intern/MOD_displace.c | 6 ++-- source/blender/modifiers/intern/MOD_dynamicpaint.c | 8 ++--- source/blender/modifiers/intern/MOD_explode.c | 15 +++++----- source/blender/modifiers/intern/MOD_fluidsim.c | 21 +++++-------- .../blender/modifiers/intern/MOD_fluidsim_util.c | 9 ++---- source/blender/modifiers/intern/MOD_mask.c | 25 ++++++---------- source/blender/modifiers/intern/MOD_simpledeform.c | 35 ++++++++-------------- source/blender/modifiers/intern/MOD_smoke.c | 20 +++++-------- source/blender/modifiers/intern/MOD_surface.c | 13 ++++---- 12 files changed, 74 insertions(+), 123 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_boolean_util.c b/source/blender/modifiers/intern/MOD_boolean_util.c index fe2a074bf87..04b6bf33b1e 100644 --- a/source/blender/modifiers/intern/MOD_boolean_util.c +++ b/source/blender/modifiers/intern/MOD_boolean_util.c @@ -586,9 +586,11 @@ int NewBooleanMesh(Scene *scene, Base *base, Base *base_select, int int_op_type) mat= (Material**)MEM_mallocN(sizeof(Material*)*maxmat, "NewBooleanMeshMat"); /* put some checks in for nice user feedback */ - if (dm == NULL || dm_select == NULL) return 0; - if (!dm->getNumTessFaces(dm) || !dm_select->getNumTessFaces(dm_select)) - { + if (dm == NULL || dm_select == NULL) { + return 0; + } + + if (!dm->getNumTessFaces(dm) || !dm_select->getNumTessFaces(dm_select)) { MEM_freeN(mat); return -1; } diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index 51ba9103976..f23690454c0 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -75,8 +75,7 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, DerivedMesh *result=NULL; /* check for alloc failing */ - if(!clmd->sim_parms || !clmd->coll_parms) - { + if (!clmd->sim_parms || !clmd->coll_parms) { initData(md); if(!clmd->sim_parms || !clmd->coll_parms) @@ -101,24 +100,18 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, dm->release(dm); } -static void updateDepgraph( - ModifierData *md, DagForest *forest, Scene *scene, Object *ob, - DagNode *obNode) +static void updateDepgraph(ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) { ClothModifierData *clmd = (ClothModifierData*) md; Base *base; - if(clmd) - { - for(base = scene->base.first; base; base= base->next) - { + if(clmd) { + for(base = scene->base.first; base; base= base->next) { Object *ob1= base->object; - if(ob1 != ob) - { + if (ob1 != ob) { CollisionModifierData *coll_clmd = (CollisionModifierData *)modifiers_findByType(ob1, eModifierType_Collision); - if(coll_clmd) - { + if (coll_clmd) { DagNode *curNode = dag_get_node(forest, ob1); dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Cloth Collision"); } @@ -175,8 +168,7 @@ static void freeData(ModifierData *md) { ClothModifierData *clmd = (ClothModifierData*) md; - if (clmd) - { + if (clmd) { if(G.rt > 0) printf("clothModifier_freeData\n"); diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 1476c792169..82c8b19db2d 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -207,12 +207,10 @@ static void deformVerts(ModifierData *md, Object *ob, } /* happens on file load (ONLY when i decomment changes in readfile.c) */ - if(!collmd->bvhtree) - { + if (!collmd->bvhtree) { collmd->bvhtree = bvhtree_build_from_mvert(collmd->mfaces, collmd->numfaces, collmd->current_x, numverts, ob->pd->pdef_sboft); } - else - { + else { // recalc static bounding boxes bvhtree_update_from_mvert ( collmd->bvhtree, collmd->mfaces, collmd->numfaces, collmd->current_x, collmd->current_xnew, collmd->numverts, 1 ); } @@ -225,14 +223,11 @@ static void deformVerts(ModifierData *md, Object *ob, } } - else if(current_time < collmd->time_xnew) - { + else if(current_time < collmd->time_xnew) { freeData((ModifierData *)collmd); } - else - { - if(numverts != collmd->numverts) - { + else { + if (numverts != collmd->numverts) { freeData((ModifierData *)collmd); } } diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c index e0972ff2d32..55971e358a9 100644 --- a/source/blender/modifiers/intern/MOD_displace.c +++ b/source/blender/modifiers/intern/MOD_displace.c @@ -99,12 +99,10 @@ static int dependsOnTime(ModifierData *md) { DisplaceModifierData *dmd = (DisplaceModifierData *)md; - if(dmd->texture) - { + if(dmd->texture) { return BKE_texture_dependsOnTime(dmd->texture); } - else - { + else { return 0; } } diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c b/source/blender/modifiers/intern/MOD_dynamicpaint.c index c7b4d41e646..e567765d61b 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.c +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c @@ -119,15 +119,13 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, DynamicPaintModifierData *pmd = (DynamicPaintModifierData*) md; /* add relation from canvases to all brush objects */ - if(pmd && pmd->canvas) - { + if (pmd && pmd->canvas) { Base *base = scene->base.first; - for(; base; base = base->next) { + for (; base; base = base->next) { DynamicPaintModifierData *pmd2 = (DynamicPaintModifierData *)modifiers_findByType(base->object, eModifierType_DynamicPaint); - if(pmd2 && pmd2->brush && ob!=base->object) - { + if (pmd2 && pmd2->brush && ob!=base->object) { DagNode *brushNode = dag_get_node(forest, base->object); dag_add_relation(forest, brushNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Dynamic Paint Brush"); } diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index 89e47094108..05230abdcf5 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -818,13 +818,13 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd, vertpahash= BLI_edgehash_new(); for (i=0; ialive==PARS_UNBORN && (emd->flag&eExplodeFlag_Unborn)==0) - || (pa->alive==PARS_ALIVE && (emd->flag&eExplodeFlag_Alive)==0) - || (pa->alive==PARS_DEAD && (emd->flag&eExplodeFlag_Dead)==0)) { + if ((pa->alive == PARS_UNBORN && (emd->flag & eExplodeFlag_Unborn) == 0) || + (pa->alive == PARS_ALIVE && (emd->flag & eExplodeFlag_Alive) == 0) || + (pa->alive == PARS_DEAD && (emd->flag & eExplodeFlag_Dead) == 0)) + { delface++; continue; } @@ -915,8 +915,7 @@ static DerivedMesh * explodeMesh(ExplodeModifierData *emd, MFace source; int orig_v4; - if(facepa[i]!=totpart) - { + if (facepa[i]!=totpart) { pa=pars+facepa[i]; if(pa->alive==PARS_UNBORN && (emd->flag&eExplodeFlag_Unborn)==0) continue; diff --git a/source/blender/modifiers/intern/MOD_fluidsim.c b/source/blender/modifiers/intern/MOD_fluidsim.c index 8bf56193a28..3df8718a7c1 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim.c +++ b/source/blender/modifiers/intern/MOD_fluidsim.c @@ -85,12 +85,12 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *result = NULL; /* check for alloc failing */ - if(!fluidmd->fss) - { + if(!fluidmd->fss) { initData(md); - if(!fluidmd->fss) + if (!fluidmd->fss) { return dm; + } } result= fluidsimModifier_do(fluidmd, md->scene, ob, dm, useRenderParams, isFinalCalc); @@ -105,20 +105,15 @@ static void updateDepgraph( FluidsimModifierData *fluidmd= (FluidsimModifierData*) md; Base *base; - if(fluidmd && fluidmd->fss) - { - if(fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) - { - for(base = scene->base.first; base; base= base->next) - { + if(fluidmd && fluidmd->fss) { + if(fluidmd->fss->type == OB_FLUIDSIM_DOMAIN) { + for(base = scene->base.first; base; base= base->next) { Object *ob1= base->object; - if(ob1 != ob) - { + if(ob1 != ob) { FluidsimModifierData *fluidmdtmp = (FluidsimModifierData *)modifiers_findByType(ob1, eModifierType_Fluidsim); // only put dependancies from NON-DOMAIN fluids in here - if(fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type!=OB_FLUIDSIM_DOMAIN)) - { + if(fluidmdtmp && fluidmdtmp->fss && (fluidmdtmp->fss->type!=OB_FLUIDSIM_DOMAIN)) { DagNode *curNode = dag_get_node(forest, ob1); dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Fluidsim Object"); } diff --git a/source/blender/modifiers/intern/MOD_fluidsim_util.c b/source/blender/modifiers/intern/MOD_fluidsim_util.c index 9dc560afb0f..dc0c4d5ad86 100644 --- a/source/blender/modifiers/intern/MOD_fluidsim_util.c +++ b/source/blender/modifiers/intern/MOD_fluidsim_util.c @@ -506,12 +506,10 @@ static DerivedMesh *fluidsim_read_cache(Object *ob, DerivedMesh *orgdm, Fluidsim // load vertex velocities, if they exist... // TODO? use generate flag as loading flag as well? // warning, needs original .bobj.gz mesh loading filename - if(displaymode==3) - { + if (displaymode==3) { fluidsim_read_vel_cache(fluidmd, dm, targetFile); } - else - { + else { if(fss->meshVelocities) MEM_freeN(fss->meshVelocities); @@ -548,8 +546,7 @@ DerivedMesh *fluidsimModifier_do(FluidsimModifierData *fluidmd, Scene *scene, // clmd->sim_parms->timescale= timescale; // support reversing of baked fluid frames here - if((fss->flag & OB_FLUIDSIM_REVERSE) && (fss->lastgoodframe >= 0)) - { + if ((fss->flag & OB_FLUIDSIM_REVERSE) && (fss->lastgoodframe >= 0)) { framenr = fss->lastgoodframe - framenr + 1; CLAMP(framenr, 1, fss->lastgoodframe); } diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index edef19fd032..b9768ff9999 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -85,12 +85,10 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, { MaskModifierData *mmd = (MaskModifierData *)md; - if (mmd->ob_arm) - { + if (mmd->ob_arm) { DagNode *armNode = dag_get_node(forest, mmd->ob_arm); - dag_add_relation(forest, armNode, obNode, - DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier"); + dag_add_relation(forest, armNode, obNode, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Mask Modifier"); } } @@ -140,8 +138,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } /* if mode is to use selected armature bones, aggregate the bone groups */ - if (mmd->mode == MOD_MASK_MODE_ARM) /* --- using selected bones --- */ - { + if (mmd->mode == MOD_MASK_MODE_ARM) { /* --- using selected bones --- */ GHash *vgroupHash; Object *oba= mmd->ob_arm; bPoseChannel *pchan; @@ -156,10 +153,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, bone_select_array= MEM_mallocN(defbase_tot * sizeof(char), "mask array"); - for (i = 0, def = ob->defbase.first; def; def = def->next, i++) - { - if (((pchan= get_pose_channel(oba->pose, def->name)) && pchan->bone && (pchan->bone->flag & BONE_SELECTED))) - { + for (i = 0, def = ob->defbase.first; def; def = def->next, i++) { + pchan = get_pose_channel(oba->pose, def->name); + if (pchan && pchan->bone && (pchan->bone->flag & BONE_SELECTED)) { bone_select_array[i]= TRUE; bone_select_tot++; } @@ -179,8 +175,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, BLI_ghash_insert(vgroupHash, def->name, SET_INT_IN_POINTER(i)); /* if no bones selected, free hashes and return original mesh */ - if (bone_select_tot == 0) - { + if (bone_select_tot == 0) { BLI_ghash_free(vgroupHash, NULL, NULL); MEM_freeN(bone_select_array); @@ -189,8 +184,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, /* repeat the previous check, but for dverts */ dvert= dm->getVertDataArray(dm, CD_MDEFORMVERT); - if (dvert == NULL) - { + if (dvert == NULL) { BLI_ghash_free(vgroupHash, NULL, NULL); MEM_freeN(bone_select_array); @@ -311,8 +305,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, } /* all verts must be available */ - if (ok) - { + if (ok) { BLI_ghash_insert(polyHash, SET_INT_IN_POINTER(i), SET_INT_IN_POINTER(numPolys)); loop_mapping[numPolys] = numLoops; numPolys++; diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index 4485346bf55..f8e50828ef8 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -74,8 +74,7 @@ static void simpleDeform_taper(const float factor, const float dcut[3], float *c co[1] = y + y*scale; co[2] = z; - if(dcut) - { + if (dcut) { co[0] += dcut[0]; co[1] += dcut[1]; co[2] += dcut[2]; @@ -93,9 +92,7 @@ static void simpleDeform_stretch(const float factor, const float dcut[3], float co[1] = y*scale; co[2] = z*(1.0f+factor); - - if(dcut) - { + if (dcut) { co[0] += dcut[0]; co[1] += dcut[1]; co[2] += dcut[2]; @@ -115,8 +112,7 @@ static void simpleDeform_twist(const float factor, const float *dcut, float *co) co[1] = x*sint + y*cost; co[2] = z; - if(dcut) - { + if(dcut) { co[0] += dcut[0]; co[1] += dcut[1]; co[2] += dcut[2]; @@ -132,16 +128,13 @@ static void simpleDeform_bend(const float factor, const float dcut[3], float *co sint = sin(theta); cost = cos(theta); - if(fabsf(factor) > 1e-7f) - { + if (fabsf(factor) > 1e-7f) { co[0] = -(y-1.0f/factor)*sint; co[1] = (y-1.0f/factor)*cost + 1.0f/factor; co[2] = z; } - - if(dcut) - { + if (dcut) { co[0] += cost*dcut[0]; co[1] += sint*dcut[0]; co[2] += dcut[2]; @@ -176,12 +169,10 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object { transf = &tmp_transf; - if(smd->originOpts & MOD_SIMPLEDEFORM_ORIGIN_LOCAL) - { + if (smd->originOpts & MOD_SIMPLEDEFORM_ORIGIN_LOCAL) { space_transform_from_matrixs(transf, ob->obmat, smd->origin->obmat); } - else - { + else { copy_m4_m4(transf->local2target, smd->origin->obmat); invert_m4_m4(transf->target2local, transf->local2target); } @@ -230,17 +221,17 @@ static void SimpleDeformModifier_do(SimpleDeformModifierData *smd, struct Object { float weight = defvert_array_find_weight_safe(dvert, i, vgroup); - if(weight != 0.0f) - { + if (weight != 0.0f) { float co[3], dcut[3] = {0.0f, 0.0f, 0.0f}; - if(transf) space_transform_apply(transf, vertexCos[i]); + if(transf) { + space_transform_apply(transf, vertexCos[i]); + } copy_v3_v3(co, vertexCos[i]); - //Apply axis limits - if(smd->mode != MOD_SIMPLEDEFORM_MODE_BEND) //Bend mode shoulnt have any lock axis - { + /* Apply axis limits */ + if(smd->mode != MOD_SIMPLEDEFORM_MODE_BEND) { /* Bend mode shoulnt have any lock axis */ if(smd->axis & MOD_SIMPLEDEFORM_LOCK_AXIS_X) axis_limit(0, lock_axis, co, dcut); if(smd->axis & MOD_SIMPLEDEFORM_LOCK_AXIS_Y) axis_limit(1, lock_axis, co, dcut); } diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 9b03816ed04..1472639739e 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -109,21 +109,16 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, { SmokeModifierData *smd = (SmokeModifierData *) md; - if(smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) - { - if(smd->domain->fluid_group) - { + if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { + if (smd->domain->fluid_group) { GroupObject *go = NULL; - for(go = smd->domain->fluid_group->gobject.first; go; go = go->next) - { - if(go->ob) - { + for (go = smd->domain->fluid_group->gobject.first; go; go = go->next) { + if (go->ob) { SmokeModifierData *smd2 = (SmokeModifierData *)modifiers_findByType(go->ob, eModifierType_Smoke); // check for initialized smoke object - if(smd2 && (((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd2->coll))) - { + if (smd2 && (((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd2->coll))) { DagNode *curNode = dag_get_node(forest, go->ob); dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Smoke Flow"); } @@ -133,11 +128,10 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, else { Base *base = scene->base.first; - for(; base; base = base->next) { + for ( ; base; base = base->next) { SmokeModifierData *smd2 = (SmokeModifierData *)modifiers_findByType(base->object, eModifierType_Smoke); - if(smd2 && (((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd2->coll))) - { + if (smd2 && (((smd2->type & MOD_SMOKE_TYPE_FLOW) && smd2->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd2->coll))) { DagNode *curNode = dag_get_node(forest, base->object); dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Smoke Flow"); } diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index 7e85acd47e9..ccb6e79eb64 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -59,9 +59,8 @@ static void initData(ModifierData *md) static void freeData(ModifierData *md) { SurfaceModifierData *surmd = (SurfaceModifierData*) md; - - if (surmd) - { + + if (surmd) { if(surmd->bvhtree) { free_bvhtree_from_mesh(surmd->bvhtree); MEM_freeN(surmd->bvhtree); @@ -102,14 +101,12 @@ static void deformVerts(ModifierData *md, Object *ob, if(derivedData) surmd->dm = CDDM_copy(derivedData); else surmd->dm = get_dm(ob, NULL, NULL, NULL, 0); - if(!ob->pd) - { + if (!ob->pd) { printf("SurfaceModifier deformVerts: Should not happen!\n"); return; } - - if(surmd->dm) - { + + if(surmd->dm) { unsigned int numverts = 0, i = 0; int init = 0; float *vec; -- cgit v1.2.3