[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24581] branches/bmesh/blender/source/ blender/blenkernel/intern: fix for materials not displaying in object mode wiht subsurf

[Joseph Eagar]

Revision: 24581
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24581
Author:   joeedh
Date:     2009-11-16 09:26:47 +0100 (Mon, 16 Nov 2009)

Log Message:
-----------
fix for materials not displaying in object mode wiht subsurf

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2009-11-16 02:52:02 UTC (rev 24580)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c	2009-11-16 08:26:47 UTC (rev 24581)
@@ -1657,6 +1657,8 @@
 			mf[k].v1 = f->v1->keyindex;
 			mf[k].v2 = f->v2->keyindex;
 			mf[k].v3 = f->v3->keyindex;
+			mf[k].mat_nr = mp->mat_nr;
+			mf[k].flag = mp->flag;
 			origIndex[k] = f->v1->tmp.l;
 
 			k++;
@@ -1695,9 +1697,6 @@
 		mf->v2 = mloop[mf->v2].v;
 		mf->v3 = mloop[mf->v3].v;
 
-		mf->flag = mpoly[origIndex[i]].flag;
-		mf->mat_nr = mpoly[origIndex[i]].mat_nr;
-
 		mesh_loops_to_corners(fdata, ldata, pdata,
 			lindex, i, origIndex[i], numTex, numCol);
 	}

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-11-16 02:52:02 UTC (rev 24580)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-11-16 08:26:47 UTC (rev 24581)
@@ -1506,7 +1506,7 @@
 void cgdm_loopIterStep(void *self)
 {
 	cgdm_loopIter *liter = self;
-	MFace *mf = &liter->fiter->mface;
+	MFace *mf = liter->fiter->mface;
 	int i, v1, v2;
 
 	liter->head.index++;
@@ -1638,10 +1638,12 @@
 					                      edgeSize, gridSize);
 					mf->v4 = getFaceIndex(ss, f, S, x + 1, y + 0,
 					                      edgeSize, gridSize);
+					if (faceFlags) {
+						mat_nr = faceFlags[index*4+1];
+						mf->flag = faceFlags[index*4];
+					} else mf->flag = flag;
+
 					mf->mat_nr = mat_nr;
-					if(faceFlags) mf->flag = faceFlags[index*4];
-					else mf->flag = flag;
-
 					i++;
 				}
 			}