- only cosmetic stuff; result of going over the output of mipspro cc

  compile round. Wrong prototypes, unused variables, zealot const usage,
  and in action.c fixed insane & unreadable function call syntax.

4 files changed, 11 insertions, 28 deletions

diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index 4a66f064966..fb9a072b34c 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -258,7 +258,7 @@ void do_soundbuts(unsigned short event)
 }
 
 
-static void sound_panel_listener()
+static void sound_panel_listener(void)
 {
 	uiBlock *block;
 	int xco= 100, yco=100, mixrate;
@@ -288,7 +288,7 @@ static void sound_panel_listener()
 	
 }
 
-static void sound_panel_sequencer()
+static void sound_panel_sequencer(void)
 {
 	uiBlock *block;
 	short xco, yco;
@@ -943,7 +943,7 @@ static char *avicodec_str(void)
 }
 #endif
 
-static void render_panel_output()
+static void render_panel_output(void)
 {
 	ID *id;
 	int a,b;
@@ -1012,7 +1012,7 @@ static void render_panel_output()
 	}
 }
 
-static void render_panel_render()
+static void render_panel_render(void)
 {
 	uiBlock *block;
 
@@ -1069,7 +1069,7 @@ static void render_panel_render()
 
 }
 
-static void render_panel_anim()
+static void render_panel_anim(void)
 {
 	uiBlock *block;
 
@@ -1096,7 +1096,7 @@ static void render_panel_anim()
 	uiBlockEndAlign(block);
 }
 
-static void render_panel_format()
+static void render_panel_format(void)
 {
 	uiBlock *block;
 	int yofs;
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 75f19245550..e7bb4ccb3bc 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -1111,10 +1111,8 @@ static void texture_panel_texture(MTex *mtex, Material *ma, World *wrld, Lamp *l
 	/* TYPES */
 	if(mtex && mtex->tex) {
 		Tex *tex= mtex->tex;
-		int xco;
 
 		uiSetButLock(tex->id.lib!=0, "Can't edit library data");
-		xco= 275;
 		uiDefButS(block, ROW, B_TEXTYPE, texstr[0],			160, 150, 70, 20, &tex->type, 1.0, 0.0, 0, 0, "Default");
 
 		uiDefButS(block, ROW, B_TEXTYPE, texstr[TEX_IMAGE],	160, 110, 70, 20, &tex->type, 1.0, (float)TEX_IMAGE, 0, 0, "Selects image texture type");
@@ -1572,7 +1570,6 @@ static void world_panel_world(World *wrld)
 {
 	uiBlock *block;
 	ID *id, *idfrom;
-	short xco;
 	
 	block= uiNewBlock(&curarea->uiblocks, "world_panel_world", UI_EMBOSS, UI_HELV, curarea->win);
 	if(uiNewPanel(curarea, block, "World", "World", 320, 0, 318, 204)==0) return;
@@ -1581,7 +1578,7 @@ static void world_panel_world(World *wrld)
 	buttons_active_id(&id, &idfrom);
 
 	uiBlockSetCol(block, TH_BUT_SETTING2);
-	xco= std_libbuttons(block, 10, 180, 0, NULL, B_WORLDBROWSE, id, idfrom, &(G.buts->menunr), B_WORLDALONE, B_WORLDLOCAL, B_WORLDDELETE, 0, B_KEEPDATA);
+	std_libbuttons(block, 10, 180, 0, NULL, B_WORLDBROWSE, id, idfrom, &(G.buts->menunr), B_WORLDALONE, B_WORLDLOCAL, B_WORLDDELETE, 0, B_KEEPDATA);
 
 	if(wrld==NULL) return;
 	
@@ -2384,7 +2381,7 @@ static void material_panel_material(Object *ob, Material *ma)
 	ID *id, *idn, *idfrom;
 	uiBut *but;
 	float *colpoin = NULL, min;
-	int rgbsel = 0, xco= 0;
+	int rgbsel = 0;
 	char str[30];
 	
 	block= uiNewBlock(&curarea->uiblocks, "material_panel_material", UI_EMBOSS, UI_HELV, curarea->win);
@@ -2394,7 +2391,7 @@ static void material_panel_material(Object *ob, Material *ma)
 	buttons_active_id(&id, &idfrom);
 
 	uiBlockSetCol(block, TH_BUT_SETTING2);
-	xco= std_libbuttons(block, 8, 200, 0, NULL, B_MATBROWSE, id, idfrom, &(G.buts->menunr), B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA);
+	std_libbuttons(block, 8, 200, 0, NULL, B_MATBROWSE, id, idfrom, &(G.buts->menunr), B_MATALONE, B_MATLOCAL, B_MATDELETE, B_AUTOMATNAME, B_KEEPDATA);
 	
 	uiDefIconBut(block, BUT, B_MATCOPY, ICON_COPYUP,	263,200,XIC,YIC, 0, 0, 0, 0, 0, "Copies Material to the buffer");
 	uiSetButLock(id && id->lib, "Can't edit library data");
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c
index b18d78fed2c..c84d6a7da23 100644
--- a/source/blender/src/interface.c
+++ b/source/blender/src/interface.c
@@ -2906,7 +2906,7 @@ int uiDoBlocks(ListBase *lb, int event)
 
 	uiBlock *block, *first;
 	uiEvent uevent;
-	int retval= UI_NOTHING, cont= 1, dopop=0;
+	int retval= UI_NOTHING, cont= 1;
 
 	if(lb->first==0) return UI_NOTHING;
 	
@@ -2962,7 +2962,6 @@ int uiDoBlocks(ListBase *lb, int event)
 			}
 			
 			/* to make sure the matrix of the panel works for menus too */
-			dopop= 1;
 			if(retval==UI_CONT || (retval & UI_RETURN)) break;
 			first= lb->first; if(first->flag & UI_BLOCK_LOOP) break;
 			
diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c
index ae146975d90..156f9bc89f0 100644
--- a/source/blender/src/interface_panel.c
+++ b/source/blender/src/interface_panel.c
@@ -771,15 +771,10 @@ static void ui_draw_panel_header(uiBlock *block)
 void ui_draw_panel(uiBlock *block)
 {
 	Panel *panel= block->panel;
-	int align=0, ofsx;
+	int ofsx;
 	
 	if(panel->paneltab) return;
 
-	if(curarea->spacetype==SPACE_BUTS) {
-		SpaceButs *sbuts= curarea->spacedata.first;
-		align= sbuts->align;
-	}
-	
 	if(panel->flag & PNL_CLOSEDY) {
 		uiSetRoundBox(15);
 		BIF_ThemeColorShade(TH_HEADER, -30);
@@ -849,14 +844,6 @@ void ui_draw_panel(uiBlock *block)
 			BIF_ThemeColor4(TH_PANEL);
 			glRectf(block->minx, block->miny, block->maxx, block->maxy);
 
-			//if(align) {
-			//	glColor4ub(206, 206, 206, 100);
-			//	if(align==BUT_HORIZONTAL) ui_set_panel_pattern('h');
-			//	else ui_set_panel_pattern('v');
-
-			//	glRectf(block->minx, block->miny, block->maxx, block->maxy);
-			//	glDisable(GL_POLYGON_STIPPLE);
-			// }
 			glDisable(GL_BLEND);
 		}
 		else if(panel->control & UI_PNL_TRANSP) {