[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57949] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: fix for own error in 57226, broke subsurf-uv

[Campbell Barton]

Revision: 57949
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57949
Author:   campbellbarton
Date:     2013-07-02 21:47:42 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
fix for own error in 57226, broke subsurf-uv

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-07-02 21:03:16 UTC (rev 57948)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-07-02 21:47:42 UTC (rev 57949)
@@ -290,7 +290,7 @@
 	MVert *mvert = dm->getVertArray(dm);
 	int totvert = dm->getNumVerts(dm);
 	int totface = dm->getNumPolys(dm);
-	int i, j, j_next, seam;
+	int i, seam;
 	UvMapVert *v;
 	UvVertMap *vmap;
 	float limit[2];
@@ -339,6 +339,7 @@
 	for (i = 0; i < totface; i++) {
 		MPoly *mp = &((MPoly *) mpoly)[i];
 		int nverts = mp->totloop;
+		int j, j_next;
 		CCGFace *origf = ccgSubSurf_getFace(origss, SET_INT_IN_POINTER(i));
 		/* unsigned int *fv = &mp->v1; */
 		MLoop *ml = mloop + mp->loopstart;
@@ -353,14 +354,14 @@
 		get_face_uv_map_vert(vmap, mpoly, ml, i, fverts);
 
 		for (j = 0, j_next = nverts - 1; j < nverts; j_next = j++) {
-			unsigned int v0 = GET_UINT_FROM_POINTER(fverts[j]);
-			unsigned int v1 = GET_UINT_FROM_POINTER(fverts[j_next]);
-			MVert *mv0 = mvert + (ml[j].v);
-			MVert *mv1 = mvert + (ml[j_next].v);
+			unsigned int v0 = GET_UINT_FROM_POINTER(fverts[j_next]);
+			unsigned int v1 = GET_UINT_FROM_POINTER(fverts[j]);
+			MVert *mv0 = mvert + (ml[j_next].v);
+			MVert *mv1 = mvert + (ml[j].v);
 
 			if (!BLI_edgehash_haskey(ehash, v0, v1)) {
-				CCGEdge *e, *orige = ccgSubSurf_getFaceEdge(origf, j);
-				CCGEdgeHDL ehdl = SET_INT_IN_POINTER(mp->loopstart + j);
+				CCGEdge *e, *orige = ccgSubSurf_getFaceEdge(origf, j_next);
+				CCGEdgeHDL ehdl = SET_INT_IN_POINTER(mp->loopstart + j_next);
 				float crease;
 
 				if ((mv0->flag & mv1->flag) & ME_VERT_MERGED)
@@ -368,7 +369,7 @@
 				else
 					crease = ccgSubSurf_getEdgeCrease(orige);
 
-				ccgSubSurf_syncEdge(ss, ehdl, fverts[j], fverts[j_next], crease, &e);
+				ccgSubSurf_syncEdge(ss, ehdl, fverts[j_next], fverts[j], crease, &e);
 				BLI_edgehash_insert(ehash, v0, v1, NULL);
 			}
 		}