MSVC compile error fix for subsurf UV.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 10 Jan 2006 12:25:07 +0000 (12:25 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 10 Jan 2006 12:25:07 +0000 (12:25 +0000)
source/blender/blenkernel/intern/subsurf_ccg.c

index 0bb6e11faad3e27a2d361f6edc1d9e7c5c8e6661..6c64a954b49235d2be99ee0e422740022e69707d 100644 (file)
@@ -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;