[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16688] trunk/blender/source/blender/ blenkernel/intern/multires.c: Fix for second part of bug #17506: issue with swapped uv coordinates

[Brecht Van Lommel]

Revision: 16688
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16688
Author:   blendix
Date:     2008-09-22 23:22:16 +0200 (Mon, 22 Sep 2008)

Log Message:
-----------
Fix for second part of bug #17506: issue with swapped uv coordinates
on creating multires in editmode, wasn't doing test_index_face for
the face data.

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

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c	2008-09-22 21:15:48 UTC (rev 16687)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c	2008-09-22 21:22:16 UTC (rev 16688)
@@ -208,7 +208,7 @@
 	}
 }
 
-static void multires_get_face(MultiresFace *f, EditFace *efa, MFace *m)
+static void multires_get_face(MultiresFace *f, CustomData *fdata, int findex, EditFace *efa, MFace *m)
 {
 	if(efa) {
 		MFace tmp;
@@ -218,7 +218,7 @@
 		tmp.v3= efa->v3->tmp.l;
 		tmp.v4= 0;
 		if(efa->v4) tmp.v4= efa->v4->tmp.l;
-		test_index_face(&tmp, NULL, 0, efa->v4?4:3);
+		test_index_face(&tmp, fdata, findex, efa->v4?4:3);
 		for(j=0; j<4; ++j) f->v[j]= (&tmp.v1)[j];
 
 		/* Flags */
@@ -388,7 +388,7 @@
 	                           &me->mr->fdata, CD_MTFACE);
 	if(em) efa= em->faces.first;
 	for(i=0; i<lvl->totface; ++i) {
-		multires_get_face(&lvl->faces[i], efa, &me->mface[i]);
+		multires_get_face(&lvl->faces[i], &me->mr->fdata, i, efa, &me->mface[i]);
 		if(em) efa= efa->next;
 	}
 
@@ -765,7 +765,7 @@
 	if(em) efa= em->faces.first;
 	for(i=0; i<cr_lvl->totface; ++i) {
 		MultiresFace mftmp;
-		multires_get_face(&mftmp, efa, &me->mface[i]);
+		multires_get_face(&mftmp, &me->mr->fdata, i, efa, &me->mface[i]);
 		if(cr_lvl->faces[i].flag != mftmp.flag)
 			cr_flag_damaged[i]= 1;
 		if(cr_lvl->faces[i].mat_nr != mftmp.mat_nr)