diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 11:58:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-21 11:58:38 +0400 |
| commit | d599b643b7a1882ea79851e334d7ed133f362bb3 (patch) | |
| tree | 4e4640c1b2e7cc82d9db81dbd98a39777dcbce7c /source/blender/editors/armature | |
| parent | f3ece5a108db0bdbefb4663ef4ebd9a7e039e263 (diff) | |
style cleanup: bge, switch statements mostly.
also left bmesh decimator on in previous commit.
Diffstat (limited to 'source/blender/editors/armature')
| -rw-r--r-- | source/blender/editors/armature/editarmature.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/armature/meshlaplacian.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index 5d4609fcd7c..0a244db5df8 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -3301,7 +3301,9 @@ static void hide_unselected_armature_bones(Scene *scene) for (ebone = arm->edbo->first; ebone; ebone = ebone->next) { bArmature *arm = obedit->data; if (EBONE_VISIBLE(arm, ebone)) { - if (ebone->flag & (BONE_TIPSEL | BONE_SELECTED | BONE_ROOTSEL)) ; + if (ebone->flag & (BONE_TIPSEL | BONE_SELECTED | BONE_ROOTSEL)) { + /* pass */ + } else { ebone->flag |= BONE_HIDDEN_A; } diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index 82fef00b1e6..0f1d48ff8af 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -1195,7 +1195,7 @@ static int meshdeform_tri_intersect(const float orig[3], const float end[3], con } static void harmonic_ray_callback(void *userdata, int index, const BVHTreeRay *ray, BVHTreeRayHit *hit) - { +{ void **data = userdata; MeshDeformBind *mdb = data[1]; MFace *mface = data[0], *mf; @@ -1210,7 +1210,7 @@ static void harmonic_ray_callback(void *userdata, int index, const BVHTreeRay *r if (mf->v4) copy_v3_v3(face[3], mdb->cagecos[mf->v4]); - add_v3_v3v3(end, isec->start, isec->vec); + add_v3_v3v3(end, isec->start, isec->vec); if (!meshdeform_tri_intersect(ray->origin, end, face[0], face[1], face[2], co, uvw)) if (!mf->v4 || !meshdeform_tri_intersect(ray->origin, end, face[0], face[2], face[3], co, uvw)) @@ -1257,7 +1257,7 @@ static MDefBoundIsect *meshdeform_ray_tree_intersect(MeshDeformBind *mdb, float if (BLI_bvhtree_ray_cast(mdb->bvhtree, isect_mdef.start, isect_mdef.vec, 0.0, &hit, harmonic_ray_callback, data) != -1) { - len = isect_mdef.labda; + len = isect_mdef.labda; isect_mdef.face = mface = mface1 + hit.index; /* create MDefBoundIsect */ |