forked from bartvdbraak/blender
MSVC compile error fix for subsurf UV.
This commit is contained in:
parent
25225dc959
commit
b3eef4f9f1
@ -224,8 +224,7 @@ static float *getFaceUV(CCGSubSurf *ss, CCGFace *f, int S, int x, int y, int edg
|
|||||||
}
|
}
|
||||||
else if (y==gridSize-1) {
|
else if (y==gridSize-1) {
|
||||||
CCGVert *v = ccgSubSurf_getFaceVert(ss, f, S);
|
CCGVert *v = ccgSubSurf_getFaceVert(ss, f, S);
|
||||||
S = (S+numVerts-1)%numVerts;
|
CCGEdge *e = ccgSubSurf_getFaceEdge(ss, f, (S+numVerts-1)%numVerts);
|
||||||
CCGEdge *e = ccgSubSurf_getFaceEdge(ss, f, S);
|
|
||||||
|
|
||||||
if (v==ccgSubSurf_getEdgeVert0(ss, e))
|
if (v==ccgSubSurf_getEdgeVert0(ss, e))
|
||||||
return ccgSubSurf_getEdgeData(ss, e, gridSize-1-x);
|
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];
|
CCGVertHDL fverts[4];
|
||||||
EdgeHash *ehash;
|
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);
|
vmap= make_uv_vert_map(mface, tface, totface, totvert, 0, limit);
|
||||||
if (!vmap)
|
if (!vmap)
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user