[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26953] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: bugfix [#21167] subsurf+some modifier+ 2 material FAIL

[Campbell Barton]

Revision: 26953
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26953
Author:   campbellbarton
Date:     2010-02-16 11:36:17 +0100 (Tue, 16 Feb 2010)

Log Message:
-----------
bugfix [#21167] subsurf+some modifier+ 2 material FAIL
constructive modifiers after subsurf ignored face materials.

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	2010-02-16 10:12:05 UTC (rev 26952)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2010-02-16 10:36:17 UTC (rev 26953)
@@ -767,7 +767,10 @@
 	mf->v3 = getFaceIndex(ss, f, grid, x+1, y+1, edgeSize, gridSize);
 	mf->v4 = getFaceIndex(ss, f, grid, x+1, y+0, edgeSize, gridSize);
 
-	if(faceFlags) mf->flag = faceFlags[i*2];
+	if(faceFlags) {
+		mf->flag = faceFlags[i*2];
+		mf->mat_nr = faceFlags[i*2+1];
+	}
 	else mf->flag = ME_SMOOTH;
 }