[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41496] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #28935: Material display error VBO + Texture Solid + Modifier

[Sergey Sharybin]

Revision: 41496
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41496
Author:   nazgul
Date:     2011-11-03 12:43:45 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Fix #28935: Material display error VBO + Texture Solid + Modifier

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        
2011-11-03 12:40:15 UTC (rev 41495)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c        
2011-11-03 12:43:45 UTC (rev 41496)
@@ -1598,6 +1598,9 @@
        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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs