fix for bad NULL check in bmo_connect_pair, also remove duplicate checks in if statements and redundant initialization vars.

2 files changed, 1 insertions, 2 deletions

diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 6e294d15dab..63b44fb30d4 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -174,7 +174,6 @@ void EDBM_stats_update(BMEditMesh *em)
 DerivedMesh *EDBM_mesh_deform_dm_get(BMEditMesh *em)
 {
 	return ((em->derivedFinal != NULL) &&
-	        (em->derivedFinal) &&
 	        (em->derivedFinal->type == DM_TYPE_EDITBMESH) &&
 	        (em->derivedFinal->deformedOnly != false)) ? em->derivedFinal : NULL;
 }
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 5b777a1cda3..fc61c94ff64 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1682,7 +1682,7 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl
 	rctf rect;
 	GLuint buffer[64];      // max 4 items per select, so large enuf
 	short hits;
-	extern void setwinmatrixview3d(ARegion *ar, View3D *v3d, rctf *rect); // XXX check a bit later on this... (ton)
+	extern void setwinmatrixview3d(ARegion *, View3D *, rctf *); // XXX check a bit later on this... (ton)
 
 	/* when looking through a selected camera, the manipulator can be at the
 	 * exact same position as the view, skip so we don't break selection */