diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-09-12 02:58:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-12 03:53:31 +0400 |
commit | 194f7f0ae85ed8ab6065f9fcf526c25296a4a6a2 (patch) | |
tree | 6e1d01126ce94930dc94609954b0b81fb447cd40 /source | |
parent | 482354fd6a9703459bb221a234ddcf28d9742a25 (diff) |
Cleanup & remove redundant check
Diffstat (limited to 'source')
3 files changed, 6 insertions, 17 deletions
diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index d74e86d999c..b7914e84c50 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -190,7 +190,7 @@ static void bm_loop_customdata_merge( BM_ELEM_CD_GET_VOID_P(l_a_outer, offset), BM_ELEM_CD_GET_VOID_P(l_b_outer, offset)) == true) - /* epsilon for comparing UV's is too big, gives noticable problems */ + /* epsilon for comparing UV's is too big, gives noticable problems */ #if 0 && /* check if the data ends up diverged */ diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.h b/source/blender/compositor/operations/COM_MovieDistortionOperation.h index 9e8d7eeba60..577712eda56 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.h +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.h @@ -57,7 +57,8 @@ public: int width, int height, int calibration_width, int calibration_height, bool inverted, - const int margin[2]) { + const int margin[2]) + { this->m_k1 = movieclip->tracking.camera.k1; this->m_k2 = movieclip->tracking.camera.k2; this->m_k3 = movieclip->tracking.camera.k3; @@ -98,7 +99,8 @@ public: bool isCacheFor(MovieClip *movieclip, int width, int height, int calibration_width, int claibration_height, - bool inverted) { + bool inverted) + { return this->m_k1 == movieclip->tracking.camera.k1 && this->m_k2 == movieclip->tracking.camera.k2 && this->m_k3 == movieclip->tracking.camera.k3 && diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 29a1ec3dcd3..c7d63da8281 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -550,21 +550,8 @@ static unsigned int bm_mesh_elems_select_get_n__internal( if (i == 0) { /* pass */ } - else if (n == i) { - return i; - } else { - /* check if the elems we found are all that's selected */ - unsigned int n_sel; - switch (itype) { - case BM_VERTS_OF_MESH: n_sel = bm->totvertsel; break; - case BM_EDGES_OF_MESH: n_sel = bm->totedgesel; break; - default: n_sel = bm->totfacesel; break; - } - if (n_sel == i) { - return i; - } - /* start over reading the selection */ + return i; } } |