From b3eef4f9f1430016892a42d08de67d230f3eb4e7 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 10 Jan 2006 12:25:07 +0000
Subject: [PATCH] MSVC compile error fix for subsurf UV.

---
 source/blender/blenkernel/intern/subsurf_ccg.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 0bb6e11faad..6c64a954b49 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -224,8 +224,7 @@ static float *getFaceUV(CCGSubSurf *ss, CCGFace *f, int S, int x, int y, int edg
 	}
 	else if (y==gridSize-1) {
 		CCGVert *v = ccgSubSurf_getFaceVert(ss, f, S);
-		S = (S+numVerts-1)%numVerts;
-		CCGEdge *e = ccgSubSurf_getFaceEdge(ss, f, S);
+		CCGEdge *e = ccgSubSurf_getFaceEdge(ss, f, (S+numVerts-1)%numVerts);
 
 		if (v==ccgSubSurf_getEdgeVert0(ss, e))
 			return ccgSubSurf_getEdgeData(ss, e, gridSize-1-x);
@@ -272,7 +271,7 @@ static int ss_sync_from_uv(CCGSubSurf *ss, CCGSubSurf *origss, Mesh *me, DispLis
 	CCGVertHDL fverts[4];
 	EdgeHash *ehash;
 
-	limit[0]= limit[1]= 0.0001;
+	limit[0]= limit[1]= 0.0001f;
 	vmap= make_uv_vert_map(mface, tface, totface, totvert, 0, limit);
 	if (!vmap)
 		return 0;