[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25404] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #20393: subsurfed objects only allow a single material.

Brecht Van Lommel brecht at blender.org
Tue Dec 15 19:00:26 CET 2009


Revision: 25404
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25404
Author:   blendix
Date:     2009-12-15 19:00:22 +0100 (Tue, 15 Dec 2009)

Log Message:
-----------
Fix #20393: subsurfed objects only allow a single material.

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	2009-12-15 17:53:17 UTC (rev 25403)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2009-12-15 18:00:22 UTC (rev 25404)
@@ -931,8 +931,8 @@
 	for(index = 0; index < totface; index++) {
 		CCGFace *f = ccgdm->faceMap[index].face;
 		int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f);
-		int mat_nr = 0;
-		int flag = ME_SMOOTH; /* assume face is smooth by default */
+		int flag = (faceFlags)? faceFlags[index*2]: ME_SMOOTH;
+		int mat_nr = (faceFlags)? faceFlags[index*2+1]: 0;
 
 		for(S = 0; S < numVerts; S++) {
 			for(y = 0; y < gridSize - 1; y++) {
@@ -947,8 +947,7 @@
 					mf->v4 = getFaceIndex(ss, f, S, x + 1, y + 0,
 					                      edgeSize, gridSize);
 					mf->mat_nr = mat_nr;
-					if(faceFlags) mf->flag = faceFlags[index*2];
-					else mf->flag = flag;
+					mf->flag = flag;
 
 					i++;
 				}





More information about the Bf-blender-cvs mailing list