Various warning fixes

13 files changed, 12 insertions, 17 deletions

diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index b9aa842b6dc..e38bb00fe8d 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -660,7 +660,6 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
 			for(i = 0; i < dm->drawObject->nelements/3; i++) {
 				int actualFace = dm->drawObject->faceRemap[i];
 				int flag = 1;
-				unsigned char *cp = NULL;
 
 				if(drawParams) {
 					flag = drawParams(tf? &tf[actualFace]: NULL, mcol? &mcol[actualFace*4]: NULL, mf[actualFace].mat_nr);
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 918a67311a0..459db96dbfb 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -57,7 +57,6 @@ static void spacetype_free(SpaceType *st)
 	ARegionType *art;
 	PanelType *pt;
 	HeaderType *ht;
-	MenuType *mt;
 	
 	for(art= st->regiontypes.first; art; art= art->next) {
 		BLI_freelistN(&art->drawcalls);
diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h
index 1d275e70a17..e6aded12f3b 100644
--- a/source/blender/blenlib/BLI_arithb.h
+++ b/source/blender/blenlib/BLI_arithb.h
@@ -348,7 +348,7 @@ void VecUpMat3(float *vec, float mat[][3], short axis);
 
 void VecCopyf(float *v1, float *v2);
 int VecLen(int *v1, int *v2);
-float VecLenf(float *v1, float *v2);
+float VecLenf(float v1[3], float v2[3]);
 float VecLength(float *v);
 void VecMulf(float *v1, float f);
 void VecNegf(float *v1);
@@ -412,7 +412,7 @@ void NormalFloatToShort(short *out, float *in);
 float DistVL2Dfl(float *v1, float *v2, float *v3);
 float PdistVL2Dfl(float *v1, float *v2, float *v3);
 float PdistVL3Dfl(float *v1, float *v2, float *v3);
-void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3);
+void PclosestVL3Dfl(float *closest, float v1[3], float v2[3], float v3[3]);
 float AreaF2Dfl(float *v1, float *v2, float *v3);
 float AreaQ3Dfl(float *v1, float *v2, float *v3, float *v4);
 float AreaT3Dfl(float *v1, float *v2, float *v3);
diff --git a/source/blender/blenlib/intern/arithb.c b/source/blender/blenlib/intern/arithb.c
index 26bbbf040f3..6c9ae78bac4 100644
--- a/source/blender/blenlib/intern/arithb.c
+++ b/source/blender/blenlib/intern/arithb.c
@@ -2151,7 +2151,7 @@ int VecLen( int *v1, int *v2)
 	return (int)floor(sqrt(x*x+y*y+z*z));
 }
 
-float VecLenf( float *v1, float *v2)
+float VecLenf(float v1[3], float v2[3])
 {
 	float x,y,z;
 
@@ -5131,7 +5131,7 @@ int point_in_tri_prism(float p[3], float v1[3], float v2[3], float v3[3])
 }
 
 /* point closest to v1 on line v2-v3 in 3D */
-void PclosestVL3Dfl(float *closest, float *v1, float *v2, float *v3)
+void PclosestVL3Dfl(float *closest, float v1[3], float v2[3], float v3[3])
 {
 	float lambda, cp[3];
 
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index 3d0d776f549..8f74752ec8c 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -29,6 +29,7 @@
 #define ED_OBJECT_H
 
 struct wmKeyConfig;
+struct wmKeyMap;
 struct Scene;
 struct Object;
 struct bContext;
diff --git a/source/blender/editors/mesh/editface.c b/source/blender/editors/mesh/editface.c
index f65ab7ddd67..8f9dea00a1b 100644
--- a/source/blender/editors/mesh/editface.c
+++ b/source/blender/editors/mesh/editface.c
@@ -711,9 +711,6 @@ void face_borderselect(Scene *scene, ScrArea *sa, ARegion *ar)
 // XXX	val= get_border(&rect, 3);
 	
 	if(val) {
-		View3D *v3d= sa->spacedata.first;
-		RegionView3D *rv3d= ar->regiondata;
-
 		/* without this border select often fails */
 #if 0 /* XXX untested in 2.5 */
 		if (v3d->flag & V3D_NEEDBACKBUFDRAW) {
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 971e0a147d3..80ea5c51e1f 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -484,9 +484,9 @@ static int removedoublesflag_exec(bContext *C, wmOperator *op)
 	Object *obedit= CTX_data_edit_object(C);
 	EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
 	/*char msg[100];*/
-	int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
 
 	/*XXX this messes up last operator panel
+	int cnt = removedoublesflag(em,1,0,RNA_float_get(op->ptr, "limit"));
 	if(cnt)
 	{
 		sprintf(msg, "Removed %d vertices", cnt);
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 3a3e4f54915..c8d85aace47 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -55,6 +55,7 @@
 #include "WM_types.h"
 
 #include "ED_mesh.h"
+#include "ED_object.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 #include "ED_view3d.h"
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 4f9a3d22f3b..eea36f630b7 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -63,8 +63,6 @@
 
 void ED_operatortypes_object(void)
 {
-	wmOperatorType *ot;
-
 	WM_operatortype_append(OBJECT_OT_location_clear);
 	WM_operatortype_append(OBJECT_OT_rotation_clear);
 	WM_operatortype_append(OBJECT_OT_scale_clear);
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index fc0aa28a2c3..4f667ab7976 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -305,7 +305,6 @@ static void calc_area_normal(Sculpt *sd, SculptSession *ss, float out[3], const
 static void do_draw_brush(Sculpt *sd, SculptSession *ss, const ListBase* active_verts)
 {
 	float area_normal[3];
-	int j;
 	ActiveData *node= active_verts->first;
 	float* buffer;
 
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index 9b3cb581c88..1641d1c8fac 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -56,6 +56,7 @@
 
 #include "ED_image.h"
 #include "ED_mesh.h"
+#include "ED_object.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
 
diff --git a/source/blender/gpu/gpu_buffers.h b/source/blender/gpu/gpu_buffers.h
index 20b502387da..662912f9c19 100644
--- a/source/blender/gpu/gpu_buffers.h
+++ b/source/blender/gpu/gpu_buffers.h
@@ -141,9 +141,9 @@ void *GPU_buffer_lock_stream( GPUBuffer *buffer );
 void GPU_buffer_unlock( GPUBuffer *buffer );
 
 /* upload three unsigned chars, representing RGB colors, for each vertex. Resets dm->drawObject->colType to -1 */
-void GPU_color3_upload( struct DerivedMesh *dm, char *data );
+void GPU_color3_upload( struct DerivedMesh *dm, unsigned char *data );
 /* upload four unsigned chars, representing RGBA colors, for each vertex. Resets dm->drawObject->colType to -1 */
-void GPU_color4_upload( struct DerivedMesh *dm, char *data );
+void GPU_color4_upload( struct DerivedMesh *dm, unsigned char *data );
 /* switch color rendering on=1/off=0 */
 void GPU_color_switch( int mode );
 
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index e750a3d05fd..2563f7977cc 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -1150,14 +1150,14 @@ void GPU_buffer_unbind()
 		glBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
 }
 
-void GPU_color3_upload( DerivedMesh *dm, char *data )
+void GPU_color3_upload( DerivedMesh *dm, unsigned char *data )
 {
 	if( dm->drawObject == 0 )
 		dm->drawObject = GPU_drawobject_new(dm);
 	GPU_buffer_free(dm->drawObject->colors,globalPool);
 	dm->drawObject->colors = GPU_buffer_setup( dm, dm->drawObject, sizeof(char)*3*dm->drawObject->nelements, GL_ARRAY_BUFFER_ARB, data, GPU_buffer_copy_color3 );
 }
-void GPU_color4_upload( DerivedMesh *dm, char *data )
+void GPU_color4_upload( DerivedMesh *dm, unsigned char *data )
 {
 	if( dm->drawObject == 0 )
 		dm->drawObject = GPU_drawobject_new(dm);