code cleanup: remove paranoid NULL checks (these cases would crash earlier of the vars were in fact NULL)

8 files changed, 31 insertions, 30 deletions

diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c
index cda2cf303eb..2845b2f95c9 100644
--- a/source/blender/avi/intern/avi.c
+++ b/source/blender/avi/intern/avi.c
@@ -734,16 +734,15 @@ AviError AVI_close(AviMovie *movie)
 
 	fclose(movie->fp);
 
-	for (i = 0; movie->header && (i < movie->header->Streams); i++) {
-		if (movie->streams && (movie->streams[i].sf != NULL)) {
+	for (i = 0; i < movie->header->Streams; i++) {
+		if (movie->streams[i].sf != NULL) {
 			MEM_freeN(movie->streams[i].sf);
 		}
 	}
 
-	if (movie->header != NULL)
-		MEM_freeN(movie->header);
-	if (movie->streams != NULL)
-		MEM_freeN(movie->streams);
+	MEM_freeN(movie->header);
+	MEM_freeN(movie->streams);
+
 	if (movie->entries != NULL)
 		MEM_freeN(movie->entries);
 	if (movie->offset_table != NULL)
@@ -1082,15 +1081,15 @@ AviError AVI_close_compress(AviMovie *movie)
 
 	fclose(movie->fp);
 
-	for (i = 0; movie->header && (i < movie->header->Streams); i++) {
+	for (i = 0; i < movie->header->Streams; i++) {
 		if (movie->streams && (movie->streams[i].sf != NULL)) {
 			MEM_freeN(movie->streams[i].sf);
 		}
 	}
-	if (movie->header != NULL)
-		MEM_freeN(movie->header);
-	if (movie->entries != NULL)
-		MEM_freeN(movie->entries);
+
+	MEM_freeN(movie->header);
+	MEM_freeN(movie->entries);
+
 	if (movie->streams != NULL)
 		MEM_freeN(movie->streams);
 	if (movie->offset_table != NULL)
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
index e41361fcb2e..bedbfc72722 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
@@ -79,14 +79,10 @@ void ExecutionSystemHelper::addNode(vector<Node *>& nodes, Node *node)
 
 Node *ExecutionSystemHelper::addNode(vector<Node *>& nodes, bNode *b_node, bool inActiveGroup, bool fast)
 {
-	Node *node;
-	node = Converter::convert(b_node, fast);
+	Node *node = Converter::convert(b_node, fast);
 	node->setIsInActiveGroup(inActiveGroup);
-	if (node != NULL) {
-		addNode(nodes, node);
-		return node;
-	}
-	return NULL;
+	addNode(nodes, node);
+	return node;
 }
 void ExecutionSystemHelper::addOperation(vector<NodeOperation *>& operations, NodeOperation *operation)
 {
diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c
index 738fdc229fb..cb52d88f985 100644
--- a/source/blender/editors/armature/editarmature.c
+++ b/source/blender/editors/armature/editarmature.c
@@ -4589,7 +4589,9 @@ void ED_pose_deselectall(Object *ob, int test)
 	int selectmode = 0;
 	
 	/* we call this from outliner too */
-	if (ELEM(NULL, ob, ob->pose)) return;
+	if (ob->pose == NULL) {
+		return;
+	}
 	
 	/*	Determine if we're selecting or deselecting	*/
 	if (test == 1) {
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 7c8386d55dc..a6afe6b2d04 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -585,13 +585,11 @@ void OBJECT_OT_hook_add_newobj(wmOperatorType *ot)
 static int object_hook_remove_exec(bContext *C, wmOperator *op)
 {
 	int num = RNA_enum_get(op->ptr, "modifier");
-	Object *ob = NULL;
+	Object *ob = CTX_data_edit_object(C);
 	HookModifierData *hmd = NULL;
 
-	ob = CTX_data_edit_object(C);
 	hmd = (HookModifierData *)BLI_findlink(&ob->modifiers, num);
-
-	if (!ob || !hmd) {
+	if (!hmd) {
 		BKE_report(op->reports, RPT_ERROR, "Couldn't find hook modifier");
 		return OPERATOR_CANCELLED;
 	}
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index 8b7cf406642..823de61d044 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -433,8 +433,11 @@ static int tree_element_active_bone(bContext *C, Scene *scene, TreeElement *te,
 	
 	if (set) {
 		if (!(bone->flag & BONE_HIDDEN_P)) {
-			if (set == 2) ED_pose_deselectall(OBACT, 2);  // 2 is clear active tag
-			else ED_pose_deselectall(OBACT, 0);
+			Object *ob = OBACT;
+			if (ob) {
+				if (set == 2) ED_pose_deselectall(ob, 2);  // 2 is clear active tag
+				else ED_pose_deselectall(ob, 0);
+			}
 			
 			if (set == 2 && (bone->flag & BONE_SELECTED)) {
 				bone->flag &= ~BONE_SELECTED;
@@ -444,7 +447,7 @@ static int tree_element_active_bone(bContext *C, Scene *scene, TreeElement *te,
 				arm->act_bone = bone;
 			}
 			
-			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, OBACT);
+			WM_event_add_notifier(C, NC_OBJECT | ND_BONE_ACTIVE, ob);
 		}
 	}
 	else {
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c
index 6e42380fbce..895b256ab84 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -507,7 +507,7 @@ static void update_tface_color_layer(DerivedMesh *dm)
 					finalCol[i * 4 + j].r = 255;
 				}
 		}
-		else if (tface && mface && set_draw_settings_cached(0, tface, ma, Gtexdraw)) {
+		else if (tface && set_draw_settings_cached(0, tface, ma, Gtexdraw)) {
 			for (j = 0; j < 4; j++) {
 				finalCol[i * 4 + j].b = 255;
 				finalCol[i * 4 + j].g = 0;
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index d1f0d8fa25e..a51ec15bd86 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -3305,7 +3305,8 @@ static void draw_em_fancy(Scene *scene, View3D *v3d, RegionView3D *rv3d,
 
 		draw_em_fancy_edges(em, scene, v3d, me, cageDM, 0, eed_act);
 	}
-	if (em) {
+
+	{
 		draw_em_fancy_verts(scene, v3d, ob, em, cageDM, eve_act, rv3d);
 
 		if (me->drawflag & ME_DRAWNORMALS) {
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 4df49386ce1..2f7452772ef 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -682,9 +682,11 @@ ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
 		}
 	}
 	
-	if (tga.imgdes & 0x20) IMB_flipy(ibuf);
+	if (tga.imgdes & 0x20) {
+		IMB_flipy(ibuf);
+	}
 
-	if (ibuf && ibuf->rect)
+	if (ibuf->rect)
 		IMB_convert_rgba_to_abgr(ibuf);
 	
 	return(ibuf);