remove some paranoid NULL checks, since the pointers are used already.

5 files changed, 5 insertions, 7 deletions

diff --git a/release/plugins/sequence/color-correction-hsv.c b/release/plugins/sequence/color-correction-hsv.c
index 120ca76bbe7..cff2f1aad82 100644
--- a/release/plugins/sequence/color-correction-hsv.c
+++ b/release/plugins/sequence/color-correction-hsv.c
@@ -187,12 +187,13 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width,
 	double gamma_table[256];
 	double uv_table[256];
 	float *destf = out->rect_float;
-	float *src1f = ibuf1->rect_float;
+	float *src1f;
 	
 	if (!ibuf1) return;
 
 	dest= (char *) out->rect;
 	src1= (char *) ibuf1->rect;
+	src1f= ibuf1->rect_float;
 
 	for (y = 0; y < 256; y++) {
 	        float v = 1.0 * y / 255;
diff --git a/release/plugins/sequence/color-correction-yuv.c b/release/plugins/sequence/color-correction-yuv.c
index 721cadb07ce..b80489f3b0b 100644
--- a/release/plugins/sequence/color-correction-yuv.c
+++ b/release/plugins/sequence/color-correction-yuv.c
@@ -120,12 +120,13 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width,
 	float gamma_table[256];
 	float uv_table[256];
 	float *destf = out->rect_float;
-	float *src1f = ibuf1->rect_float;
+	float *src1f;
 	
 	if (!ibuf1) return;
 
 	dest= (char *) out->rect;
 	src1= (char *) ibuf1->rect;
+	src1f= ibuf1->rect_float;
 
 	for (y = 0; y < 256; y++) {
 	        float v = 1.0 * y / 255;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index cd0872807a0..d6c91c3c908 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -199,7 +199,6 @@ static int can_pbvh_draw(Object *ob, DerivedMesh *dm)
 static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
 {
 	CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
-	Mesh *me= (ob)? ob->data: NULL;
 
 	if(!ob) {
 		cddm->pbvh= NULL;
@@ -217,6 +216,7 @@ static struct PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm)
 	   this derivedmesh is just original mesh. it's the multires subsurf dm
 	   that this is actually for, to support a pbvh on a modified mesh */
 	if(!cddm->pbvh && ob->type == OB_MESH) {
+		Mesh *me= ob->data;
 		cddm->pbvh = BLI_pbvh_new();
 		cddm->pbvh_draw = can_pbvh_draw(ob, dm);
 		BLI_pbvh_build_mesh(cddm->pbvh, me->mface, me->mvert,
diff --git a/source/blender/editors/metaball/mball_edit.c b/source/blender/editors/metaball/mball_edit.c
index 1170a910c92..a9a673fdf20 100644
--- a/source/blender/editors/metaball/mball_edit.c
+++ b/source/blender/editors/metaball/mball_edit.c
@@ -95,8 +95,6 @@ MetaElem *add_metaball_primitive(bContext *C, float mat[4][4], int type, int UNU
 	MetaBall *mball = (MetaBall*)obedit->data;
 	MetaElem *ml;
 
-	if(!obedit) return NULL;
-
 	/* Deselect all existing metaelems */
 	ml= mball->editelems->first;
 	while(ml) {
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 0ccf905a851..581dedfe655 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -272,8 +272,6 @@ static void cache_voxeldata(struct Render *re, Tex *tex)
 	int curframe;
 	char path[sizeof(vd->source_path)];
 	
-	if (!vd) return;
-	
 	/* only re-cache if dataset needs updating */
 	if ((vd->flag & TEX_VD_STILL) || (vd->cachedframe == re->r.cfra))
 		if (vd->ok) return;