[Bf-blender-cvs] [194f7f0] master: Cleanup & remove redundant check

[Campbell Barton]

Commit: 194f7f0ae85ed8ab6065f9fcf526c25296a4a6a2
Author: Campbell Barton
Date:   Fri Sep 12 08:58:26 2014 +1000
Branches: master
https://developer.blender.org/rB194f7f0ae85ed8ab6065f9fcf526c25296a4a6a2

Cleanup & remove redundant check

===================================================================

M	source/blender/bmesh/operators/bmo_inset.c
M	source/blender/compositor/operations/COM_MovieDistortionOperation.h
M	source/blender/editors/transform/transform_orientations.c

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c
index d74e86d..b7914e8 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 9e8d7ee..577712e 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 29a1ec3..c7d63da 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;
 		}
 	}