1 files changed, 14 insertions, 11 deletions

diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index 6e10fe526da..04a6cf5c5b0 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -39,20 +39,23 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
+#include "BLI_math.h"
+#include "BLI_editVert.h"
+#include "BLI_utildefines.h"
+
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh.h"
-#include "BKE_utildefines.h"
 #include "BKE_tessmesh.h"
 
-#include "BLI_math.h"
-#include "BLI_editVert.h"
 #include "BLI_array.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "ED_util.h"
 #include "ED_image.h"
 #include "ED_mesh.h"
+#include "ED_uvedit.h"
 
 #include "UI_resources.h"
 
@@ -119,7 +122,7 @@ static int draw_uvs_face_check(Scene *scene)
 		return (ts->uv_selectmode == UV_SELECT_FACE);
 }
 
-static void draw_uvs_shadow(SpaceImage *sima, Object *obedit)
+static void draw_uvs_shadow(Object *obedit)
 {
 	BMEditMesh *em;
 	BMFace *efa;
@@ -421,7 +424,7 @@ static void draw_uvs_stretch(SpaceImage *sima, Scene *scene, BMEditMesh *em, MTe
 	}
 }
 
-static void draw_uvs_other(SpaceImage *sima, Scene *scene, Object *obedit, MTexPoly *activetf)
+static void draw_uvs_other(Scene *scene, Object *obedit, MTexPoly *activetf)
 {
 	Base *base;
 	Image *curimage;
@@ -474,9 +477,9 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	MTexPoly *tf, *activetf = NULL;
 	MLoopUV *luv;
 	DerivedMesh *finaldm, *cagedm;
-	char col1[4], col2[4];
+	unsigned char col1[4], col2[4];
 	float pointsize;
-	int drawfaces, interpedges, lastsel, sel;
+	int drawfaces, interpedges;
 	int i;
 	Image *ima= sima->image;
  	
@@ -493,7 +496,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 	
 	/* draw other uvs */
 	if(sima->flag & SI_DRAW_OTHER)
-		draw_uvs_other(sima, scene, obedit, activetf);
+		draw_uvs_other(scene, obedit, activetf);
 
 	/* 1. draw shadow mesh */
 	
@@ -676,8 +679,8 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object *obedit)
 			glColor4ubv((unsigned char *)col2); 
 			
 			if(me->drawflag & ME_DRAWEDGES) {
+				int lastsel= 0, sel;
 				UI_GetThemeColor4ubv(TH_VERTEX_SELECT, col1);
-				lastsel = sel = 0;
 
 				if(interpedges) {
 					glShadeModel(GL_SMOOTH);
@@ -857,7 +860,7 @@ void draw_uvedit_main(SpaceImage *sima, ARegion *ar, Scene *scene, Object *obedi
 
 	if(show_uvedit || show_uvshadow) {
 		if(show_uvshadow)
-			draw_uvs_shadow(sima, obedit);
+			draw_uvs_shadow(obedit);
 		else
 			draw_uvs(sima, scene, obedit);