From 019dca9c54289136b34c688a048ee009e2e852ee Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 4 Oct 2011 08:28:37 +0000
Subject: remove redundant code, also dont bother with os.path.basename(x) for
 recent scons commit.

---
 source/blender/blenkernel/intern/object.c         | 7 ++-----
 source/blender/blenkernel/intern/seqeffects.c     | 6 ++----
 source/blender/editors/sculpt_paint/paint_image.c | 8 +++-----
 source/blender/editors/space_view3d/drawobject.c  | 2 --
 4 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ce4cc284bb0..81a31c83e95 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3060,14 +3060,13 @@ void object_camera_matrix(
 void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const short do_clip, const float scale[3],
                           float r_asp[2], float r_shift[2], float *r_drawsize, float r_vec[4][3])
 {
-	float aspx, aspy;
 	float facx, facy;
 	float depth;
 
 	/* aspect correcton */
 	if (scene) {
-		aspx= (float) scene->r.xsch*scene->r.xasp;
-		aspy= (float) scene->r.ysch*scene->r.yasp;
+		float aspx= (float) scene->r.xsch*scene->r.xasp;
+		float aspy= (float) scene->r.ysch*scene->r.yasp;
 
 		if(aspx < aspy) {
 			r_asp[0]= aspx / aspy;
@@ -3079,8 +3078,6 @@ void camera_view_frame_ex(Scene *scene, Camera *camera, float drawsize, const sh
 		}
 	}
 	else {
-		aspx= 1.0f;
-		aspy= 1.0f;
 		r_asp[0]= 1.0f;
 		r_asp[1]= 1.0f;
 	}
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 70b44792b30..d8d6ed6ea6d 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -1639,8 +1639,6 @@ float hyp3,hyp4,b4,b5
 	if(wipezone->flip) x = xo - x;
 	angle = wipezone->angle;
 
-	posy = facf0 * yo;
-
 	if(wipe->forward){
 		posx = facf0 * xo;
 		posy = facf0 * yo;
@@ -2320,7 +2318,7 @@ static void RVBlurBitmap2_byte ( unsigned char* map, int width,int height,
 
 
 	/*	Swap buffers */
-	swap=temp;temp=map;map=swap;
+	swap=temp;temp=map; /* map=swap; */ /* UNUSED */
 
 	/*	Tidy up	 */
 	MEM_freeN (filter);
@@ -2490,7 +2488,7 @@ static void RVBlurBitmap2_float ( float* map, int width,int height,
 
 
 	/*	Swap buffers */
-	swap=temp;temp=map;map=swap;
+	swap=temp;temp=map; /* map=swap; */ /* UNUSED */
 
 	/*	Tidy up	 */
 	MEM_freeN (filter);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 36711d14beb..1c53be15a0f 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -2690,9 +2690,7 @@ static void project_bucket_init(const ProjPaintState *ps, const int thread_index
 			tf = ps->dm_mtface+face_index;
 			if (tpage_last != tf->tpage) {
 				tpage_last = tf->tpage;
-				
-				image_index = -1; /* sanity check */
-				
+
 				for (image_index=0; image_index < ps->image_tot; image_index++) {
 					if (ps->projImages[image_index].ima == tpage_last) {
 						ibuf = ps->projImages[image_index].ibuf;
@@ -4900,7 +4898,6 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 	time= PIL_check_seconds_timer();
 
 	tablet= 0;
-	pressure= 0;
 	pop->s.blend= pop->s.brush->blend;
 
 	if(event->custom == EVT_DATA_TABLET) {
@@ -4911,8 +4908,9 @@ static void paint_apply_event(bContext *C, wmOperator *op, wmEvent *event)
 		if(wmtab->Active == EVT_TABLET_ERASER)
 			pop->s.blend= IMB_BLEND_ERASE_ALPHA;
 	}
-	else /* otherwise airbrush becomes 1.0 pressure instantly */
+	else { /* otherwise airbrush becomes 1.0 pressure instantly */
 		pressure= pop->prev_pressure ? pop->prev_pressure : 1.0f;
+	}
 
 	if(pop->first) {
 		pop->prevmouse[0]= event->mval[0];
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 35c3e909d84..b84998e6b83 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -5103,8 +5103,6 @@ static void drawspiral(const float cent[3], float rad, float tmat[][4], int star
 		}
 	}
 	else {
-		a= 0;
-
 		fac= (float)(CIRCLE_RESOL-1) * tot_inv;
 		x= sinval[start] * fac;
 		y= cosval[start] * fac;
-- 
cgit v1.2.3