Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-03 16:43:45 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-03 16:43:45 +0400
commitaefa2cda10d5d3ad22a1ecb07c843602a4c589bb (patch)
treeb08e1b2b4aa828524b90c668f81214c8b4ade821 /source/blender/blenkernel/intern
parent563becafb9439fd8ae5e642c25acd3c46fc56941 (diff)
Fix #28935: Material display error VBO + Texture Solid + Modifier
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/subsurf_ccg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index 115b26452e1..986e0e2b552 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -1598,6 +1598,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;