[Bf-blender-cvs] [b1f29adf1e3] refactor-mesh-material-index-generic: Cleanup: Remove unnecessary subsurf DerivedMesh material index handling

Hans Goudey noreply at git.blender.org
Sat Aug 27 07:09:58 CEST 2022


Commit: b1f29adf1e38522309f0e831582a6939e0281dce
Author: Hans Goudey
Date:   Sat Aug 27 00:09:51 2022 -0500
Branches: refactor-mesh-material-index-generic
https://developer.blender.org/rBb1f29adf1e38522309f0e831582a6939e0281dce

Cleanup: Remove unnecessary subsurf DerivedMesh material index handling

===================================================================

M	source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index fe3fb05324e..1dbfd73b958 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1134,15 +1134,12 @@ static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, MPoly *mpoly)
     CCGFace *f = ccgdm->faceMap[index].face;
     int x, y, S, numVerts = ccgSubSurf_getFaceNumVerts(f);
     int flag = (faceFlags) ? faceFlags[index].flag : ME_SMOOTH;
-    int mat_nr = (faceFlags) ? faceFlags[index].mat_nr : 0;
 
     for (S = 0; S < numVerts; S++) {
       for (y = 0; y < gridSize - 1; y++) {
         for (x = 0; x < gridSize - 1; x++) {
           MPoly *mp = &mpoly[i];
 
-          /* TODO: Unbreak multires materials :( */
-          // mp->mat_nr = mat_nr;
           mp->flag = flag;
           mp->loopstart = k;
           mp->totloop = 4;



More information about the Bf-blender-cvs mailing list