diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-23 02:03:41 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-23 02:03:41 +0400 |
commit | dab1d8e4874564f182d7b73b603f66a4f34565ad (patch) | |
tree | e79733e7f9091b5a5840af54062f8e7bcb770f8b /source/blender/blenkernel | |
parent | d2a37d464a81959eb3409115f320c83af4398934 (diff) |
style cleanup
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 8 |
4 files changed, 22 insertions, 23 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index b38f0f78cdb..e067b7195ce 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -429,10 +429,10 @@ static DerivedMesh *cloth_to_triangles(DerivedMesh *dm) MFace *mface2 = NULL; /* calc faces */ - for(i = 0; i < numfaces; i++) - { - if(mface[i].v4) + for (i = 0; i < numfaces; i++) { + if (mface[i].v4) { quads++; + } } result = CDDM_from_template(dm, dm->getNumVerts(dm), 0, numfaces + quads, 0, 0); @@ -443,8 +443,7 @@ static DerivedMesh *cloth_to_triangles(DerivedMesh *dm) DM_ensure_tessface(result); mface2 = result->getTessFaceArray(result); - for(i = 0, j = numfaces; i < numfaces; i++) - { + for (i = 0, j = numfaces; i < numfaces; i++) { // DG TODO: is this necessary? mface2[i].v1 = mface[i].v1; mface2[i].v2 = mface[i].v2; @@ -453,8 +452,7 @@ static DerivedMesh *cloth_to_triangles(DerivedMesh *dm) mface2[i].v4 = 0; //test_index_face(&mface2[i], &result->faceData, i, 3); - if(mface[i].v4) - { + if (mface[i].v4) { DM_copy_tessface_data(dm, result, i, j, 1); mface2[j].v1 = mface[i].v1; diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index a93653537c7..7c5cf68affa 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -345,19 +345,17 @@ static int cloth_collision_response_static ( ClothModifierData *clmd, CollisionM } } - if(result) - { + if (result) { int i = 0; - for(i = 0; i < 3; i++) - { - if(cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[i]) < ABS(i1[i])) + for (i = 0; i < 3; i++) { + if (cloth1->verts[collpair->ap1].impulse_count > 0 && ABS(cloth1->verts[collpair->ap1].impulse[i]) < ABS(i1[i])) cloth1->verts[collpair->ap1].impulse[i] = i1[i]; - if(cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[i]) < ABS(i2[i])) + if (cloth1->verts[collpair->ap2].impulse_count > 0 && ABS(cloth1->verts[collpair->ap2].impulse[i]) < ABS(i2[i])) cloth1->verts[collpair->ap2].impulse[i] = i2[i]; - if(cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[i]) < ABS(i3[i])) + if (cloth1->verts[collpair->ap3].impulse_count > 0 && ABS(cloth1->verts[collpair->ap3].impulse[i]) < ABS(i3[i])) cloth1->verts[collpair->ap3].impulse[i] = i3[i]; } } @@ -681,8 +679,9 @@ static int cloth_bvh_objcollisions_resolve ( ClothModifierData * clmd, Collision } } - if(!result) + if (!result) { break; + } } return ret; } diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 04bce0a8f63..4e7653e2473 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -997,22 +997,22 @@ static void layerDefault_mvert_skin(void *data, int count) MVertSkin *vs = data; int i; - for(i = 0; i < count; i++) { + for (i = 0; i < count; i++) { copy_v3_fl(vs[i].radius, 0.25f); vs[i].flag = 0; } } - + static void layerInterp_mvert_skin(void **sources, float *weights, - float *UNUSED(sub_weights), - int count, void *dest) + float *UNUSED(sub_weights), + int count, void *dest) { float radius[3], w; MVertSkin *vs; int i; zero_v3(radius); - for(i = 0; i < count; i++) { + for (i = 0; i < count; i++) { w = weights ? weights[i] : 1.0f; vs = sources[i]; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 8de832e508d..6b9253e9657 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3030,10 +3030,12 @@ int BKE_object_is_animated(Scene *scene, Object *ob) ModifierData *md; for (md = modifiers_getVirtualModifierList(ob); md; md = md->next) - if(modifier_dependsOnTime(md) && - (modifier_isEnabled(scene, md, eModifierMode_Realtime) || - modifier_isEnabled(scene, md, eModifierMode_Render))) + if (modifier_dependsOnTime(md) && + (modifier_isEnabled(scene, md, eModifierMode_Realtime) || + modifier_isEnabled(scene, md, eModifierMode_Render))) + { return 1; + } return 0; } |