Various warning fixes

7 files changed, 4 insertions, 7 deletions

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"