code cleanup: duplicate checks and double assignments.

6 files changed, 10 insertions, 16 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index e2b61d81967..e6d37718cba 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -2224,7 +2224,6 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap)
 	
 	/*find-replace merged vertices with target vertices*/	
 	ml = cddm->mloop;
-	c = 0;
 	for (i=0; i<totloop; i++, ml++) {
 		if (vtargetmap[ml->v] != -1) {
 			ml->v = vtargetmap[ml->v];
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index e298f087e9c..38132f1b521 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -567,9 +567,7 @@ static void expand_local_mesh(Mesh *me)
 				for (a=0; a<me->totpoly; a++, txface++) {
 					/* special case: ima always local immediately */
 					if (txface->tpage) {
-						if (txface->tpage) {
-							id_lib_extern((ID *)txface->tpage);
-						}
+						id_lib_extern((ID *)txface->tpage);
 					}
 				}
 			}
@@ -582,9 +580,7 @@ static void expand_local_mesh(Mesh *me)
 				for (a=0; a<me->totface; a++, tface++) {
 					/* special case: ima always local immediately */
 					if (tface->tpage) {
-						if (tface->tpage) {
-							id_lib_extern((ID *)tface->tpage);
-						}
+						id_lib_extern((ID *)tface->tpage);
 					}
 				}
 			}
diff --git a/source/blender/bmesh/operators/bmo_primitive.c b/source/blender/bmesh/operators/bmo_primitive.c
index b0eb7b514de..48a25214b54 100644
--- a/source/blender/bmesh/operators/bmo_primitive.c
+++ b/source/blender/bmesh/operators/bmo_primitive.c
@@ -299,7 +299,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op)
 	BMO_slot_mat4_get(op, "mat", mat);
 
 	phid = 2.0f * (float)M_PI / tot;
-	phi = 0.25f * (float)M_PI;
+	/* phi = 0.25f * (float)M_PI; */ /* UNUSED */
 
 	/* one segment first */
 	phi = 0;
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index a6ceba061f6..a7f72481456 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -576,10 +576,9 @@ int do_paintface_box_select(ViewContext *vc, rcti *rect, int select, int extend)
 
 	selar= MEM_callocN(me->totpoly+1, "selar");
 
-	if (extend == 0 && select)
+	if (extend == 0 && select) {
 		paintface_deselect_all_visible(vc->obact, SEL_DESELECT, FALSE);
 
-	if (extend == 0 && select) {
 		mface= me->mpoly;
 		for(a=1; a<=me->totpoly; a++, mface++) {
 			if((mface->flag & ME_HIDE) == 0)
diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c
index 358cd8d2012..5104ed02f53 100644
--- a/source/blender/editors/mesh/loopcut.c
+++ b/source/blender/editors/mesh/loopcut.c
@@ -289,9 +289,9 @@ static void ringsel_find_edge(tringselOpData *lcd, int cuts)
 {
 	if (lcd->eed) {
 		edgering_sel(lcd, cuts, 0);
-	} else if(lcd->edges) {
-		if (lcd->edges)
-			MEM_freeN(lcd->edges);
+	}
+	else if (lcd->edges) {
+		MEM_freeN(lcd->edges);
 		lcd->edges = NULL;
 		lcd->totedge = 0;
 	}
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.c
index 8129b27a66e..ea47e67c1e6 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -183,12 +183,12 @@ void GPU_extensions_init(void)
 	 * really needed to prevent different unexpected behaviors like with intel gme965 card (sergey) */
 	glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_FALSE);
 
-	GG.os = GPU_OS_UNIX;
 #ifdef _WIN32
 	GG.os = GPU_OS_WIN;
-#endif
-#ifdef __APPLE__
+#elif defined(__APPLE__)
 	GG.os = GPU_OS_MAC;
+#else
+	GG.os = GPU_OS_UNIX;
 #endif
 }