diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-16 13:36:17 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-16 13:36:17 +0300 |
| commit | 046bf7a6a1c7cec01ec819796b67c510dadb5056 (patch) | |
| tree | 2c508fece754779545ab1c25879c878b6bf859da /source | |
| parent | 43af6fdae17998d4bf9e600947b4c9e8f16761fe (diff) | |
bugfix [#21167] subsurf+some modifier+ 2 material FAIL
constructive modifiers after subsurf ignored face materials.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 9bb65b47a7d..5d542e143c3 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -767,7 +767,10 @@ static void ccgDM_getFinalFace(DerivedMesh *dm, int faceNum, MFace *mf) 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; } |