Cleanup & remove redundant check
authorCampbell Barton <ideasman42@gmail.com>
Thu, 11 Sep 2014 22:58:26 +0000 (08:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 11 Sep 2014 23:53:31 +0000 (09:53 +1000)
source/blender/bmesh/operators/bmo_inset.c
source/blender/compositor/operations/COM_MovieDistortionOperation.h
source/blender/editors/transform/transform_orientations.c

index d74e86d..b7914e8 100644 (file)
@@ -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 */
index 9e8d7ee..577712e 100644 (file)
@@ -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 &&
index 29a1ec3..c7d63da 100644 (file)
@@ -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;
                }
        }