Cycles: svn merge -r41467:41531 ^/trunk/blender
[blender.git] / source / blender / blenkernel / intern / subsurf_ccg.c
index c8b6c030d616d9450b69dda60ab41920b560f89e..b6a371707bbb84d73c61f0274b1d1c477afb59cc 100644 (file)
@@ -1747,6 +1747,9 @@ static void ccgDM_drawFacesTex_common(DerivedMesh *dm,
        if(!mcol)
                mcol = dm->getFaceDataArray(dm, CD_MCOL);
 
+       if(!mcol)
+               mcol = dm->getFaceDataArray(dm, CD_TEXTURE_MCOL);
+
        totface = ccgSubSurf_getNumFaces(ss);
        for(i = 0; i < totface; i++) {
                CCGFace *f = ccgdm->faceMap[i].face;