svn merge ^/trunk/blender -r40372:40379
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:18:03 +0000 (06:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:18:03 +0000 (06:18 +0000)
1  2 
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/armature/editarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_select.c

@@@ -1095,10 -1060,10 +1095,10 @@@ static void cdDM_drawMappedFacesGLSL(De
        DMVertexAttribs attribs;
        MVert *mvert = cddm->mvert;
        MFace *mface = cddm->mface;
-       MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE);
 -      /* MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
 -      float (*nors)[3] = dm->getFaceDataArray(dm, CD_NORMAL);
++      /* MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
 +      float (*nors)[3] = dm->getTessFaceDataArray(dm, CD_NORMAL);
        int a, b, dodraw, matnr, new_matnr;
 -      int orig, *index = dm->getFaceDataArray(dm, CD_ORIGINDEX);
 +      int orig, *index = dm->getTessFaceDataArray(dm, CD_ORIGINDEX);
  
        cdDM_update_normals_from_pbvh(dm);
  
@@@ -1594,7 -1374,7 +1594,7 @@@ static void cgdm_drawMappedFacesGLSL(De
        CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss);
        GPUVertexAttribs gattribs;
        DMVertexAttribs attribs= {{{NULL}}};
-       MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE);
 -      /* MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
++      /* MTFace *tf = dm->getTessFaceDataArray(dm, CD_MTFACE); */ /* UNUSED */
        int gridSize = ccgSubSurf_getGridSize(ss);
        int gridFaces = gridSize - 1;
        int edgeSize = ccgSubSurf_getEdgeSize(ss);