diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-03-11 05:14:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-11 05:14:24 +0300 |
commit | 6b610500b99d8e6ac2950d7702f669b9fa1192fe (patch) | |
tree | c06147df52f64e7f059c0b4d3e68ce1ee6260b73 /source/blender/blenkernel | |
parent | 0d053158ecc27022af7aa184c0410b90cbc84980 (diff) |
Cleanup: indentation
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/effect.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 8 |
4 files changed, 14 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 51f17f738f0..870b020c8de 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3206,7 +3206,8 @@ static void navmesh_drawColored(DerivedMesh *dm) #endif glDisable(GL_LIGHTING); - /* if (GPU_buffer_legacy(dm) ) */ { /* TODO - VBO draw code, not high priority - campbell */ + /* if (GPU_buffer_legacy(dm) ) */ /* TODO - VBO draw code, not high priority - campbell */ + { DEBUG_VBO("Using legacy code. drawNavMeshColored\n"); //glShadeModel(GL_SMOOTH); glBegin(glmode = GL_QUADS); diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 317348903ff..3b3fe323f2b 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -780,17 +780,15 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm ) } } - if (clmd->sim_parms->vgroup_shrink > 0 ) - { - if ( dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink-1)) - { - verts->shrink_factor = clmd->sim_parms->shrink_min*(1.0f-dvert->dw[j].weight)+clmd->sim_parms->shrink_max*dvert->dw [j].weight; // linear interpolation between min and max shrink factor based on weight + if (clmd->sim_parms->vgroup_shrink > 0) { + if (dvert->dw[j].def_nr == (clmd->sim_parms->vgroup_shrink - 1)) { + /* linear interpolation between min and max shrink factor based on weight */ + verts->shrink_factor = clmd->sim_parms->shrink_min * (1.0f - dvert->dw[j].weight) + clmd->sim_parms->shrink_max * dvert->dw [j].weight; + } + } + else { + verts->shrink_factor = clmd->sim_parms->shrink_min; } - } - else { - verts->shrink_factor = clmd->sim_parms->shrink_min; - } - } } } diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 76a39fed3f6..296a56ada5d 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -231,7 +231,7 @@ ListBase *pdInitEffectors(Scene *scene, Object *ob_src, ParticleSystem *psys_src for (base = scene->base.first; base; base= base->next) { if ( (base->lay & layer) ) { if ( base->object->pd && base->object->pd->forcefield ) - add_object_to_effectors(&effectors, scene, weights, base->object, ob_src); + add_object_to_effectors(&effectors, scene, weights, base->object, ob_src); if ( base->object->particlesystem.first ) { ParticleSystem *psys= base->object->particlesystem.first; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 06d0627fd2c..3cc2337d4f1 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -522,10 +522,8 @@ static void ccd_mesh_update(Object *ob, ccd_Mesh *pccd_M) mima->maxz = max_ff(mima->maxz, v[2] + hull); } - - mima++; - mface++; - + mima++; + mface++; } return; } @@ -707,7 +705,7 @@ static void add_2nd_order_roller(Object *ob, float UNUSED(stiffness), int *count } } if ((bs2->v2 !=notthis)&&(bs2->v2 > v0)) { - (*counter)++;/*hit */ + (*counter)++; /* hit */ if (addsprings) { bs3->v1= v0; bs3->v2= bs2->v2; |